stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 04:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

*_Random is now *_RandomByte.

Browse source 
P_RandomChance is now a macro for something that should happen a
certain percentage of time.

P_SignedRandom was moved to a macro. Nobody cared.

# Conflicts:
#	src/p_inter.c
This commit is contained in:
Inuyasha 2016-03-27 07:33:15 -07:00
parent ce2c2de58a
commit ac03ce39c8
16 changed files with 233 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/d_netcmd.c
View file

@ -808,7 +808,7 @@ static boolean IsNameGood(char *name, INT32 playernum)
else if (len == 1) // Agh! else if (len == 1) // Agh!
{ {
// Last ditch effort... // Last ditch effort...
sprintf(name, "%d", M_Random() & 7); sprintf(name, "%d", M_RandomKey(10));
if (!IsNameGood (name, playernum)) if (!IsNameGood (name, playernum))
return false; return false;
} }
@ -3583,7 +3583,7 @@ retryscramble:
for (i = 0; i < playercount; i++) for (i = 0; i < playercount; i++)
{ {
if (repick) if (repick)
newteam = (INT16)((M_Random() % 2) + 1); newteam = (INT16)((M_RandomByte() % 2) + 1);
// One team has the most players they can get, assign the rest to the other team. // One team has the most players they can get, assign the rest to the other team.
if (red == maxcomposition || blue == maxcomposition) if (red == maxcomposition || blue == maxcomposition)
@ -3628,7 +3628,7 @@ retryscramble:
{ {
if (repick) if (repick)
{ {
newteam = (INT16)((M_Random() % 2) + 1); newteam = (INT16)((M_RandomByte() % 2) + 1);
repick = false; repick = false;
} }
else else

6
src/g_game.c
View file

@ -2349,7 +2349,7 @@ mapthing_t *G_FindCTFStart(INT32 playernum)
return NULL; return NULL;
} }
if ((!players[playernum].ctfteam && numredctfstarts && (!numbluectfstarts || P_Random() & 1)) || players[playernum].ctfteam == 1) //red if ((!players[playernum].ctfteam && numredctfstarts && (!numbluectfstarts || P_RandomChance(FRACUNIT/2))) || players[playernum].ctfteam == 1) //red
{ {
if (!numredctfstarts) if (!numredctfstarts)
{ {
@ -5487,7 +5487,7 @@ ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void)
UINT8 i; UINT8 i;
WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
for (i = 0; i < 16; i++, p++) for (i = 0; i < 16; i++, p++)
*p = P_Random(); // This MD5 was chosen by fair dice roll and most likely < 50% correct. *p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
#else #else
WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
md5_buffer((char *)p+16, demo_p - (p+16), (void *)p); // make a checksum of everything after the checksum in the file. md5_buffer((char *)p+16, demo_p - (p+16), (void *)p); // make a checksum of everything after the checksum in the file.
@ -5569,7 +5569,7 @@ boolean G_CheckDemoStatus(void)
UINT8 i; UINT8 i;
WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
for (i = 0; i < 16; i++, p++) for (i = 0; i < 16; i++, p++)
*p = P_Random(); // This MD5 was chosen by fair dice roll and most likely < 50% correct. *p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
#else #else
WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
md5_buffer((char *)p+16, demo_p - (p+16), p); // make a checksum of everything after the checksum in the file. md5_buffer((char *)p+16, demo_p - (p+16), p); // make a checksum of everything after the checksum in the file.

6
src/hardware/hw3sound.c
View file

@ -384,12 +384,12 @@ INT32 HW3S_I_StartSound(const void *origin_p, source3D_data_t *source_parm, chan
/*if (gamemode != heretic) /*if (gamemode != heretic)
{ {
if (sfx_id >= sfx_sawup && sfx_id <= sfx_sawhit) if (sfx_id >= sfx_sawup && sfx_id <= sfx_sawhit)
pitch += 8 - (M_Random()&15); pitch += 8 - (M_RandomByte()&15);
else if (sfx_id != sfx_itemup && sfx_id != sfx_tink) else if (sfx_id != sfx_itemup && sfx_id != sfx_tink)
pitch += 16 - (M_Random()&31); pitch += 16 - (M_RandomByte()&31);
} }
else*/ else*/
pitch = 128 + (M_Random() & 7) - (M_Random() & 7); pitch = 128 + (M_RandomByte() & 7) - (M_RandomByte() & 7);
} }
#endif #endif

4
src/hardware/hw_light.c
View file

@ -871,7 +871,7 @@ void HWR_DoCoronasLighting(FOutVector *outVerts, gr_vissprite_t *spr)
size = p_lspr->corona_radius * ((outVerts[0].z+120.0f)/950.0f); // d'ou vienne ces constante ? size = p_lspr->corona_radius * ((outVerts[0].z+120.0f)/950.0f); // d'ou vienne ces constante ?
break; break;
case ROCKET_SPR: case ROCKET_SPR:
p_lspr->corona_color = (((M_Random()>>1)&0xff)<<24)|0x0040ff; p_lspr->corona_color = (((M_RandomByte()>>1)&0xff)<<24)|0x0040ff;
// don't need a break // don't need a break
case CORONA_SPR: case CORONA_SPR:
size = p_lspr->corona_radius * ((outVerts[0].z+60.0f)/100.0f); // d'ou vienne ces constante ? size = p_lspr->corona_radius * ((outVerts[0].z+60.0f)/100.0f); // d'ou vienne ces constante ?
@ -974,7 +974,7 @@ void HWR_DrawCoronas(void)
size = p_lspr->corona_radius * ((cz+120.0f)/950.0f); // d'ou vienne ces constante ? size = p_lspr->corona_radius * ((cz+120.0f)/950.0f); // d'ou vienne ces constante ?
break; break;
case ROCKET_SPR: case ROCKET_SPR:
Surf.FlatColor.s.alpha = (UINT8)((M_Random()>>1)&0xff); Surf.FlatColor.s.alpha = (UINT8)((M_RandomByte()>>1)&0xff);
// don't need a break // don't need a break
case CORONA_SPR: case CORONA_SPR:
size = p_lspr->corona_radius * ((cz+60.0f)/100.0f); // d'ou vienne ces constante ? size = p_lspr->corona_radius * ((cz+60.0f)/100.0f); // d'ou vienne ces constante ?

39
src/lua_baselib.c
View file

@ -96,17 +96,17 @@ static int lib_evalMath(lua_State *L)
// M_RANDOM // M_RANDOM
////////////// //////////////
static int lib_pRandom(lua_State *L) static int lib_pRandomFixed(lua_State *L)
{ {
NOHUD NOHUD
lua_pushinteger(L, P_Random()); lua_pushfixed(L, P_RandomFixed());
return 1; return 1;
} }
static int lib_pSignedRandom(lua_State *L) static int lib_pRandomByte(lua_State *L)
{ {
NOHUD NOHUD
lua_pushinteger(L, P_SignedRandom()); lua_pushinteger(L, P_RandomByte());
return 1; return 1;
} }
@ -134,6 +134,30 @@ static int lib_pRandomRange(lua_State *L)
return 1; return 1;
} }
// Deprecated, macros, etc.
static int lib_pRandom(lua_State *L)
{
NOHUD
LUA_Deprecated(L, "P_Random", "P_RandomByte");
lua_pushinteger(L, P_RandomByte());
return 1;
}
static int lib_pSignedRandom(lua_State *L)
{
NOHUD
lua_pushinteger(L, P_SignedRandom());
return 1;
}
static int lib_pRandomChance(lua_State *L)
{
fixed_t p = luaL_checkfixed(L, 1);
NOHUD
lua_pushboolean(L, P_RandomChance(p));
return 1;
}
// P_MAPUTIL // P_MAPUTIL
/////////////// ///////////////
@ -1910,10 +1934,13 @@ static luaL_Reg lib[] = {
{"EvalMath", lib_evalMath}, {"EvalMath", lib_evalMath},
// m_random // m_random
{"P_Random",lib_pRandom}, {"P_RandomFixed",lib_pRandomFixed},
{"P_SignedRandom",lib_pSignedRandom}, {"P_RandomByte",lib_pRandomByte},
{"P_RandomKey",lib_pRandomKey}, {"P_RandomKey",lib_pRandomKey},
{"P_RandomRange",lib_pRandomRange}, {"P_RandomRange",lib_pRandomRange},
{"P_Random",lib_pRandom}, // DEPRECATED
{"P_SignedRandom",lib_pSignedRandom}, // MACRO
{"P_RandomChance",lib_pRandomChance}, // MACRO
// p_maputil // p_maputil
{"P_AproxDistance",lib_pAproxDistance}, {"P_AproxDistance",lib_pAproxDistance},

6
src/m_cheat.c
View file

@ -618,9 +618,9 @@ void Command_CauseCfail_f(void)
} }
P_UnsetThingPosition(players[consoleplayer].mo); P_UnsetThingPosition(players[consoleplayer].mo);
P_Random(); P_RandomFixed();
P_Random(); P_RandomByte();
P_Random(); P_RandomFixed();
players[consoleplayer].mo->x = 0; players[consoleplayer].mo->x = 0;
players[consoleplayer].mo->y = 123311; //cfail cansuled kthxbye players[consoleplayer].mo->y = 123311; //cfail cansuled kthxbye
players[consoleplayer].mo->z = 123311; players[consoleplayer].mo->z = 123311;

110
src/m_random.c
View file

@ -19,48 +19,51 @@
#include "m_random.h" #include "m_random.h"
#include "m_fixed.h" #include "m_fixed.h"
// --------------------------- // ---------------------------
// RNG functions (not synched) // RNG functions (not synched)
// --------------------------- // ---------------------------
/** Provides a random byte. /** Provides a random fixed point number. Distribution is uniform.
* Used outside the p_xxx game code and not synchronized in netgames. This is * As with all M_Random functions, not synched in netgames.
* for anything that doesn't need to be synced, e.g. precipitation.
* *
* \return A random byte, 0 to 255. * \return A random fixed point number from [0,1).
*/ */
UINT8 M_Random(void) fixed_t M_RandomFixed(void)
{ {
return (rand() & 255); return (rand() & 0xFFFF);
} }
/** Provides a random signed byte. Distribution is uniform. /** Provides a random byte. Distribution is uniform.
* As with all M_*Random functions, not synched in netgames. * As with all M_Random functions, not synched in netgames.
* *
* \return A random byte, -128 to 127. * \return A random integer from [0, 255].
* \sa M_Random
*/ */
INT32 M_SignedRandom(void) UINT8 M_RandomByte(void)
{ {
return (rand() & 255) - 128; return (rand() & 0xFF);
} }
/** Provides a random number in between 0 and the given number - 1. /** Provides a random integer for picking random elements from an array.
* Distribution is uniform. Use for picking random elements from an array. * Distribution is uniform.
* As with all M_*Random functions, not synched in netgames. * As with all M_Random functions, not synched in netgames.
* *
* \return A random number, 0 to arg1-1. * \param a Number of items in array.
* \return A random integer from [0,a).
*/ */
INT32 M_RandomKey(INT32 a) INT32 M_RandomKey(INT32 a)
{ {
return (INT32)((rand()/((unsigned)RAND_MAX+1.0f))*a); return (INT32)((rand()/((unsigned)RAND_MAX+1.0f))*a);
} }
/** Provides a random number in between a specific range. /** Provides a random integer in a given range.
* Distribution is uniform. * Distribution is uniform.
* As with all M_*Random functions, not synched in netgames. * As with all M_Random functions, not synched in netgames.
* *
* \return A random number, arg1 to arg2. * \param a Lower bound.
* \param b Upper bound.
* \return A random integer from [a,b].
*/ */
INT32 M_RandomRange(INT32 a, INT32 b) INT32 M_RandomRange(INT32 a, INT32 b)
{ {
@ -79,8 +82,7 @@ static UINT32 randomseed = 0;
// Holds the INITIAL seed value. Used for demos, possibly other debugging. // Holds the INITIAL seed value. Used for demos, possibly other debugging.
static UINT32 initialseed = 0; static UINT32 initialseed = 0;
/** /** Provides a random fixed point number.
* Provides a random fixed point number.
* This is a variant of an xorshift PRNG; state fits in a 32 bit integer structure. * This is a variant of an xorshift PRNG; state fits in a 32 bit integer structure.
* *
* \return A random fixed point number from [0,1). * \return A random fixed point number from [0,1).
@ -96,44 +98,7 @@ ATTRINLINE static fixed_t FUNCINLINE __internal_prng__(void)
return (randomseed&((FRACUNIT-1)<<9))>>9; return (randomseed&((FRACUNIT-1)<<9))>>9;
} }
/** Provides a random integer from 0 to 255. /** Provides a random fixed point number. Distribution is uniform.
* Distribution is uniform.
* If you're curious, (&0xFF00) >> 8 gives the same result
* as a fixed point multiplication by 256.
*
* \return Random integer from [0, 255].
* \sa __internal_prng__
*/
#ifndef DEBUGRANDOM
UINT8 P_Random(void)
{
#else
UINT8 P_RandomD(const char *rfile, INT32 rline)
{
CONS_Printf("P_Random() at: %sp %d\n", rfile, rline);
#endif
return (UINT8)((__internal_prng__()&0xFF00)>>8);
}
/** Provides a random integer from -128 to 127.
* Distribution is uniform.
*
* \return Random integer from [-128, 127].
* \sa __internal_prng__
*/
#ifndef DEBUGRANDOM
INT32 P_SignedRandom(void)
{
#else
INT32 P_SignedRandomD(const char *rfile, INT32 rline)
{
CONS_Printf("P_SignedRandom() at: %sp %d\n", rfile, rline);
#endif
return (INT32)((__internal_prng__()&0xFF00)>>8) - 128;
}
/**
* Provides a random fixed point number.
* Literally a wrapper for the internal PRNG function. * Literally a wrapper for the internal PRNG function.
* *
* \return A random fixed point number from [0,1). * \return A random fixed point number from [0,1).
@ -144,14 +109,34 @@ fixed_t P_RandomFixed(void)
#else #else
UINT8 P_RandomFixedD(const char *rfile, INT32 rline) UINT8 P_RandomFixedD(const char *rfile, INT32 rline)
{ {
CONS_Printf("P_Random() at: %sp %d\n", rfile, rline); CONS_Printf("P_RandomFixed() at: %sp %d\n", rfile, rline);
#endif #endif
return __internal_prng__(); return __internal_prng__();
} }
/** Provides a random byte. Distribution is uniform.
* If you're curious, (&0xFF00) >> 8 gives the same result
* as a fixed point multiplication by 256.
*
* \return Random integer from [0, 255].
* \sa __internal_prng__
*/
#ifndef DEBUGRANDOM
UINT8 P_RandomByte(void)
{
#else
UINT8 P_RandomByteD(const char *rfile, INT32 rline)
{
CONS_Printf("P_RandomByte() at: %sp %d\n", rfile, rline);
#endif
return (UINT8)((__internal_prng__()&0xFF00)>>8);
}
/** Provides a random integer for picking random elements from an array. /** Provides a random integer for picking random elements from an array.
* Distribution is uniform. * Distribution is uniform.
* NOTE: Maximum range is 65536.
* *
* \param a Number of items in array.
* \return A random integer from [0,a). * \return A random integer from [0,a).
* \sa __internal_prng__ * \sa __internal_prng__
*/ */
@ -168,8 +153,11 @@ INT32 P_RandomKeyD(const char *rfile, INT32 rline, INT32 a)
/** Provides a random integer in a given range. /** Provides a random integer in a given range.
* Distribution is uniform. * Distribution is uniform.
* NOTE: Maximum range is 65536.
* *
* \return A random integer from [a,b].P_Random * \param a Lower bound.
* \param b Upper bound.
* \return A random integer from [a,b].
* \sa __internal_prng__ * \sa __internal_prng__
*/ */
#ifndef DEBUGRANDOM #ifndef DEBUGRANDOM

22
src/m_random.h
View file

@ -25,30 +25,36 @@
// P_Random functions pulls random bytes from a PRNG that is network synced. // P_Random functions pulls random bytes from a PRNG that is network synced.
// RNG functions // RNG functions
UINT8 M_Random(void); fixed_t M_RandomFixed(void);
INT32 M_SignedRandom(void); UINT8 M_RandomByte(void);
INT32 M_RandomKey(INT32 a); INT32 M_RandomKey(INT32 a);
INT32 M_RandomRange(INT32 a, INT32 b); INT32 M_RandomRange(INT32 a, INT32 b);
// PRNG functions // PRNG functions
#ifdef DEBUGRANDOM #ifdef DEBUGRANDOM
#define P_Random() P_RandomD(__FILE__, __LINE__)
#define P_SignedRandom() P_SignedRandomD(__FILE__, __LINE__)
#define P_RandomFixed() P_RandomFixedD(__FILE__, __LINE__) #define P_RandomFixed() P_RandomFixedD(__FILE__, __LINE__)
#define P_RandomByte() P_RandomByteD(__FILE__, __LINE__)
#define P_RandomKey(c) P_RandomKeyD(__FILE__, __LINE__, c) #define P_RandomKey(c) P_RandomKeyD(__FILE__, __LINE__, c)
#define P_RandomRange(c, d) P_RandomRangeD(__FILE__, __LINE__, c, d) #define P_RandomRange(c, d) P_RandomRangeD(__FILE__, __LINE__, c, d)
UINT8 P_RandomD(const char *rfile, INT32 rline);
INT32 P_SignedRandomD(const char *rfile, INT32 rline);
fixed_t P_RandomFixedD(const char *rfile, INT32 rline); fixed_t P_RandomFixedD(const char *rfile, INT32 rline);
UINT8 P_RandomByteD(const char *rfile, INT32 rline);
INT32 P_RandomKeyD(const char *rfile, INT32 rline, INT32 a); INT32 P_RandomKeyD(const char *rfile, INT32 rline, INT32 a);
INT32 P_RandomRangeD(const char *rfile, INT32 rline, INT32 a, INT32 b); INT32 P_RandomRangeD(const char *rfile, INT32 rline, INT32 a, INT32 b);
#else #else
UINT8 P_Random(void);
INT32 P_SignedRandom(void);
fixed_t P_RandomFixed(void); fixed_t P_RandomFixed(void);
UINT8 P_RandomByte(void);
INT32 P_RandomKey(INT32 a); INT32 P_RandomKey(INT32 a);
INT32 P_RandomRange(INT32 a, INT32 b); INT32 P_RandomRange(INT32 a, INT32 b);
#endif #endif
// Macros for other functions
#define M_SignedRandom() ((INT32)M_RandomByte() - 128) // [-128, 127] signed byte, originally a
#define P_SignedRandom() ((INT32)P_RandomByte() - 128) // function of its own, moved to a macro
#define M_RandomChance(p) (M_RandomFixed() < p) // given fixed point probability, p, between 0 (0%)
#define P_RandomChance(p) (P_RandomFixed() < p) // and FRACUNIT (100%), returns true p% of the time
// Debugging
fixed_t P_RandomPeek(void); fixed_t P_RandomPeek(void);
// Working with the seed for PRNG // Working with the seed for PRNG

132
src/p_enemy.c
View file

@ -386,7 +386,7 @@ boolean P_CheckMissileRange(mobj_t *actor)
if (actor->type == MT_EGGMOBILE && dist > 160) if (actor->type == MT_EGGMOBILE && dist > 160)
dist = 160; dist = 160;
if (P_Random() < dist) if (P_RandomByte() < dist)
return false; return false;
return true; return true;
@ -486,7 +486,7 @@ static boolean P_TryWalk(mobj_t *actor)
{ {
if (!P_Move(actor, actor->info->speed)) if (!P_Move(actor, actor->info->speed))
return false; return false;
actor->movecount = P_Random() & 15; actor->movecount = P_RandomByte() & 15;
return true; return true;
} }
@ -539,7 +539,7 @@ void P_NewChaseDir(mobj_t *actor)
} }
// try other directions // try other directions
if (P_Random() > 200 || abs(deltay) > abs(deltax)) if (P_RandomChance(25*FRACUNIT/32) || abs(deltay) > abs(deltax))
{ {
tdir = d[1]; tdir = d[1];
d[1] = d[2]; d[1] = d[2];
@ -577,7 +577,7 @@ void P_NewChaseDir(mobj_t *actor)
} }
// randomly determine direction of search // randomly determine direction of search
if (P_Random() & 1) if (P_RandomChance(FRACUNIT/2))
{ {
for (tdir = DI_EAST; tdir <= DI_SOUTHEAST; tdir++) for (tdir = DI_EAST; tdir <= DI_SOUTHEAST; tdir++)
{ {
@ -632,7 +632,7 @@ boolean P_LookForPlayers(mobj_t *actor, boolean allaround, boolean tracer, fixed
// BP: first time init, this allow minimum lastlook changes // BP: first time init, this allow minimum lastlook changes
if (actor->lastlook < 0) if (actor->lastlook < 0)
actor->lastlook = P_Random(); actor->lastlook = P_RandomByte();
actor->lastlook %= MAXPLAYERS; actor->lastlook %= MAXPLAYERS;
@ -707,7 +707,7 @@ static boolean P_LookForShield(mobj_t *actor)
// BP: first time init, this allow minimum lastlook changes // BP: first time init, this allow minimum lastlook changes
if (actor->lastlook < 0) if (actor->lastlook < 0)
actor->lastlook = P_Random(); actor->lastlook = P_RandomByte();
actor->lastlook %= MAXPLAYERS; actor->lastlook %= MAXPLAYERS;
@ -2293,12 +2293,7 @@ void A_SkullAttack(mobj_t *actor)
if (locvar1 == 1) if (locvar1 == 1)
actor->angle += ANGLE_180; actor->angle += ANGLE_180;
else if (locvar1 == 2) else if (locvar1 == 2)
{ actor->angle += (P_RandomChance(FRACUNIT/2)) ? ANGLE_90 : -ANGLE_90;
if (P_Random() & 1)
actor->angle += ANGLE_90;
else
actor->angle -= ANGLE_90;
}
an = actor->angle >> ANGLETOFINESHIFT; an = actor->angle >> ANGLETOFINESHIFT;
@ -2398,9 +2393,9 @@ void A_BossScream(mobj_t *actor)
explodetype = (mobjtype_t)locvar2; explodetype = (mobjtype_t)locvar2;
if (actor->eflags & MFE_VERTICALFLIP) if (actor->eflags & MFE_VERTICALFLIP)
z = actor->z + actor->height - mobjinfo[explodetype].height - FixedMul((P_Random()<<(FRACBITS-2)) - 8*FRACUNIT, actor->scale); z = actor->z + actor->height - mobjinfo[explodetype].height - FixedMul((P_RandomByte()<<(FRACBITS-2)) - 8*FRACUNIT, actor->scale);
else else
z = actor->z + FixedMul((P_Random()<<(FRACBITS-2)) - 8*FRACUNIT, actor->scale); z = actor->z + FixedMul((P_RandomByte()<<(FRACBITS-2)) - 8*FRACUNIT, actor->scale);
mo = P_SpawnMobj(x, y, z, explodetype); mo = P_SpawnMobj(x, y, z, explodetype);
if (actor->eflags & MFE_VERTICALFLIP) if (actor->eflags & MFE_VERTICALFLIP)
@ -3461,7 +3456,7 @@ void A_BubbleSpawn(mobj_t *actor)
return; // don't make bubble! return; // don't make bubble!
} }
prandom = P_Random(); prandom = P_RandomByte();
if (leveltime % (3*TICRATE) < 8) if (leveltime % (3*TICRATE) < 8)
bubble = P_SpawnMobj(actor->x, actor->y, actor->z + (actor->height / 2), MT_EXTRALARGEBUBBLE); bubble = P_SpawnMobj(actor->x, actor->y, actor->z + (actor->height / 2), MT_EXTRALARGEBUBBLE);
@ -3509,7 +3504,7 @@ void A_FanBubbleSpawn(mobj_t *actor)
return; // don't make bubble! return; // don't make bubble!
} }
prandom = P_Random(); prandom = P_RandomByte();
if ((prandom & 0x7) == 0x7) if ((prandom & 0x7) == 0x7)
bubble = P_SpawnMobj(actor->x, actor->y, hz, MT_SMALLBUBBLE); bubble = P_SpawnMobj(actor->x, actor->y, hz, MT_SMALLBUBBLE);
@ -3550,7 +3545,7 @@ void A_BubbleRise(mobj_t *actor)
// Move around slightly to make it look like it's bending around the water // Move around slightly to make it look like it's bending around the water
if (!locvar1) if (!locvar1)
{ {
UINT8 prandom = P_Random(); UINT8 prandom = P_RandomByte();
if (!(prandom & 0x7)) // *****000 if (!(prandom & 0x7)) // *****000
{ {
P_InstaThrust(actor, prandom & 0x70 ? actor->angle + ANGLE_90 : actor->angle, P_InstaThrust(actor, prandom & 0x70 ? actor->angle + ANGLE_90 : actor->angle,
@ -3833,7 +3828,7 @@ void A_ThrownRing(mobj_t *actor)
// first time init, this allow minimum lastlook changes // first time init, this allow minimum lastlook changes
if (actor->lastlook < 0) if (actor->lastlook < 0)
actor->lastlook = P_Random(); actor->lastlook = P_RandomByte();
actor->lastlook %= MAXPLAYERS; actor->lastlook %= MAXPLAYERS;
@ -3913,7 +3908,7 @@ void A_SetSolidSteam(mobj_t *actor)
#endif #endif
actor->flags &= ~MF_NOCLIP; actor->flags &= ~MF_NOCLIP;
actor->flags |= MF_SOLID; actor->flags |= MF_SOLID;
if (!(P_Random() & 7)) if (P_RandomChance(FRACUNIT/8))
{ {
if (actor->info->deathsound) if (actor->info->deathsound)
S_StartSound(actor, actor->info->deathsound); // Hiss! S_StartSound(actor, actor->info->deathsound); // Hiss!
@ -4055,7 +4050,7 @@ void A_JetChase(mobj_t *actor)
if (actor->reactiontime) if (actor->reactiontime)
actor->reactiontime--; actor->reactiontime--;
if (P_Random() % 32 == 1) if (P_RandomChance(FRACUNIT/32))
{ {
actor->momx = actor->momx / 2; actor->momx = actor->momx / 2;
actor->momy = actor->momy / 2; actor->momy = actor->momy / 2;
@ -4416,7 +4411,7 @@ void A_JetgThink(mobj_t *actor)
if (actor->target) if (actor->target)
{ {
if (P_Random() <= 32 && !actor->reactiontime) if (P_RandomChance(FRACUNIT/8) && !actor->reactiontime)
P_SetMobjState(actor, actor->info->missilestate); P_SetMobjState(actor, actor->info->missilestate);
else else
A_JetChase (actor); A_JetChase (actor);
@ -4469,10 +4464,10 @@ void A_MouseThink(mobj_t *actor)
{ {
if (twodlevel || actor->flags2 & MF2_TWOD) if (twodlevel || actor->flags2 & MF2_TWOD)
{ {
if (P_Random() & 1) if (P_RandomChance(FRACUNIT/2))
actor->angle += ANGLE_180; actor->angle += ANGLE_180;
} }
else if (P_Random() & 1) else if (P_RandomChance(FRACUNIT/2))
actor->angle += ANGLE_90; actor->angle += ANGLE_90;
else else
actor->angle -= ANGLE_90; actor->angle -= ANGLE_90;
@ -4878,7 +4873,7 @@ void A_RockSpawn(mobj_t *actor)
type = MT_ROCKCRUMBLE1 + (sides[line->sidenum[0]].rowoffset >> FRACBITS); type = MT_ROCKCRUMBLE1 + (sides[line->sidenum[0]].rowoffset >> FRACBITS);
if (line->flags & ML_NOCLIMB) if (line->flags & ML_NOCLIMB)
randomoomph = P_Random() * (FRACUNIT/32); randomoomph = P_RandomByte() * (FRACUNIT/32);
else else
randomoomph = 0; randomoomph = 0;
@ -5172,7 +5167,7 @@ void A_CrawlaCommanderThink(mobj_t *actor)
if (locvar1) if (locvar1)
{ {
if (actor->health < 2 && P_Random() < 2) if (actor->health < 2 && P_RandomChance(FRACUNIT/128))
P_SpawnMissile(actor, actor->target, locvar1); P_SpawnMissile(actor, actor->target, locvar1);
} }
@ -5187,8 +5182,8 @@ void A_CrawlaCommanderThink(mobj_t *actor)
actor->threshold = 0; actor->threshold = 0;
// Roam around, somewhat in the player's direction. // Roam around, somewhat in the player's direction.
actor->angle += (P_Random()<<10); actor->angle += (P_RandomByte()<<10);
actor->angle -= (P_Random()<<10); actor->angle -= (P_RandomByte()<<10);
if (actor->health > 1) if (actor->health > 1)
P_InstaThrust(actor, actor->angle, FixedMul(10*FRACUNIT, actor->scale)); P_InstaThrust(actor, actor->angle, FixedMul(10*FRACUNIT, actor->scale));
@ -5204,7 +5199,7 @@ void A_CrawlaCommanderThink(mobj_t *actor)
actor->threshold = 1; actor->threshold = 1;
} }
} }
actor->reactiontime = 2*TICRATE + P_Random()/2; actor->reactiontime = 2*TICRATE + P_RandomByte()/2;
} }
if (actor->health == 1) if (actor->health == 1)
@ -5222,8 +5217,8 @@ void A_CrawlaCommanderThink(mobj_t *actor)
} }
else else
{ {
UINT8 prandom = P_Random(); UINT8 prandom = P_RandomByte();
actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y) + (P_Random() & 1 ? -prandom : +prandom); actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y) + (P_RandomChance(FRACUNIT/2) ? -prandom : +prandom);
P_InstaThrust(actor, actor->angle, FixedDiv(FixedMul(locvar2, actor->scale), 3*FRACUNIT/2)); P_InstaThrust(actor, actor->angle, FixedDiv(FixedMul(locvar2, actor->scale), 3*FRACUNIT/2));
actor->momz = FixedMul(locvar2, actor->scale); // Bounce up in air actor->momz = FixedMul(locvar2, actor->scale); // Bounce up in air
} }
@ -5552,7 +5547,7 @@ void A_MixUp(mobj_t *actor)
{ {
if (counter > 255) // fail-safe to avoid endless loop if (counter > 255) // fail-safe to avoid endless loop
break; break;
prandom = P_Random(); prandom = P_RandomByte();
prandom %= numplayers; // I love modular arithmetic, don't you? prandom %= numplayers; // I love modular arithmetic, don't you?
if (prandom) // Make sure it's not a useless mix if (prandom) // Make sure it's not a useless mix
break; break;
@ -5701,7 +5696,7 @@ void A_RecyclePowers(mobj_t *actor)
{ {
UINT8 tempint; UINT8 tempint;
i = j + ((P_Random() + leveltime) % (numplayers - j)); i = j + ((P_RandomByte() + leveltime) % (numplayers - j));
tempint = postscramble[j]; tempint = postscramble[j];
postscramble[j] = postscramble[i]; postscramble[j] = postscramble[i];
postscramble[i] = tempint; postscramble[i] = tempint;
@ -5814,7 +5809,7 @@ void A_Boss1Chase(mobj_t *actor)
{ {
if (actor->health > actor->info->damage) if (actor->health > actor->info->damage)
{ {
if (P_Random() & 1) if (P_RandomChance(FRACUNIT/2))
P_SetMobjState(actor, actor->info->missilestate); P_SetMobjState(actor, actor->info->missilestate);
else else
P_SetMobjState(actor, actor->info->meleestate); P_SetMobjState(actor, actor->info->meleestate);
@ -5833,7 +5828,7 @@ void A_Boss1Chase(mobj_t *actor)
// ? // ?
nomissile: nomissile:
// possibly choose another target // possibly choose another target
if (multiplayer && P_Random() < 2) if (multiplayer && P_RandomChance(FRACUNIT/128))
{ {
if (P_LookForPlayers(actor, true, false, 0)) if (P_LookForPlayers(actor, true, false, 0))
return; // got a new target return; // got a new target
@ -5871,7 +5866,7 @@ nomissile:
deltay = actor->target->y - actor->y; deltay = actor->target->y - actor->y;
actor->movedir = diags[((deltay < 0)<<1) + (deltax > 0)]; actor->movedir = diags[((deltay < 0)<<1) + (deltax > 0)];
actor->movecount = P_Random() & 15; actor->movecount = P_RandomByte() & 15;
} }
} }
@ -5897,13 +5892,13 @@ void A_Boss2Chase(mobj_t *actor)
// Startup randomness // Startup randomness
if (actor->reactiontime <= -666) if (actor->reactiontime <= -666)
actor->reactiontime = 2*TICRATE + P_Random(); actor->reactiontime = 2*TICRATE + P_RandomByte();
// When reactiontime hits zero, he will go the other way // When reactiontime hits zero, he will go the other way
if (--actor->reactiontime <= 0) if (--actor->reactiontime <= 0)
{ {
reverse = true; reverse = true;
actor->reactiontime = 2*TICRATE + P_Random(); actor->reactiontime = 2*TICRATE + P_RandomByte();
} }
P_SetTarget(&actor->target, P_GetClosestAxis(actor)); P_SetTarget(&actor->target, P_GetClosestAxis(actor));
@ -5990,12 +5985,12 @@ void A_Boss2Chase(mobj_t *actor)
if (actor->info->attacksound) if (actor->info->attacksound)
S_StartAttackSound(actor, actor->info->attacksound); S_StartAttackSound(actor, actor->info->attacksound);
if (P_Random() & 1) if (P_RandomChance(FRACUNIT/2))
{ {
goop->momx *= 2; goop->momx *= 2;
goop->momy *= 2; goop->momy *= 2;
} }
else if (P_Random() > 128) else if (P_RandomChance(129*FRACUNIT/256))
{ {
goop->momx *= 3; goop->momx *= 3;
goop->momy *= 3; goop->momy *= 3;
@ -6153,7 +6148,7 @@ void A_Boss7Chase(mobj_t *actor)
{ {
A_FaceTarget(actor); A_FaceTarget(actor);
P_SetMobjState(actor, S_BLACKEGG_SHOOT1); P_SetMobjState(actor, S_BLACKEGG_SHOOT1);
actor->movecount = TICRATE + P_Random()/2; actor->movecount = TICRATE + P_RandomByte()/2;
return; return;
} }
@ -6162,7 +6157,7 @@ void A_Boss7Chase(mobj_t *actor)
if (actor->reactiontime <= 0 && actor->z == actor->floorz) if (actor->reactiontime <= 0 && actor->z == actor->floorz)
{ {
// Here, we'll call P_Random() and decide what kind of attack to do // Here, we'll call P_RandomByte() and decide what kind of attack to do
switch(actor->threshold) switch(actor->threshold)
{ {
case 0: // Lob cannon balls case 0: // Lob cannon balls
@ -6170,7 +6165,7 @@ void A_Boss7Chase(mobj_t *actor)
{ {
A_FaceTarget(actor); A_FaceTarget(actor);
P_SetMobjState(actor, actor->info->xdeathstate); P_SetMobjState(actor, actor->info->xdeathstate);
actor->movecount = 7*TICRATE + P_Random(); actor->movecount = 7*TICRATE + P_RandomByte();
break; break;
} }
actor->threshold++; actor->threshold++;
@ -6180,9 +6175,9 @@ void A_Boss7Chase(mobj_t *actor)
P_SetMobjState(actor, S_BLACKEGG_SHOOT1); P_SetMobjState(actor, S_BLACKEGG_SHOOT1);
if (actor->health > actor->info->damage) if (actor->health > actor->info->damage)
actor->movecount = TICRATE + P_Random()/3; actor->movecount = TICRATE + P_RandomByte()/3;
else else
actor->movecount = TICRATE + P_Random()/2; actor->movecount = TICRATE + P_RandomByte()/2;
break; break;
case 2: // Homing Missile case 2: // Homing Missile
A_FaceTarget(actor); A_FaceTarget(actor);
@ -6266,8 +6261,8 @@ void A_Boss2PogoSFX(mobj_t *actor)
} }
else else
{ {
UINT8 prandom = P_Random(); UINT8 prandom = P_RandomByte();
actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y) + (P_Random() & 1 ? -prandom : +prandom); actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y) + (P_RandomChance(FRACUNIT/2) ? -prandom : +prandom);
P_InstaThrust(actor, actor->angle, FixedMul(FixedMul(actor->info->speed,(locvar2)), actor->scale)); P_InstaThrust(actor, actor->angle, FixedMul(FixedMul(actor->info->speed,(locvar2)), actor->scale));
} }
if (actor->info->activesound) S_StartSound(actor, actor->info->activesound); if (actor->info->activesound) S_StartSound(actor, actor->info->activesound);
@ -6307,10 +6302,10 @@ void A_Boss2PogoTarget(mobj_t *actor)
// Target hit, retreat! // Target hit, retreat!
if (actor->target->player->powers[pw_flashing] > TICRATE || actor->flags2 & MF2_FRET) if (actor->target->player->powers[pw_flashing] > TICRATE || actor->flags2 & MF2_FRET)
{ {
UINT8 prandom = P_Random(); UINT8 prandom = P_RandomByte();
actor->z++; // unstick from the floor actor->z++; // unstick from the floor
actor->momz = FixedMul(locvar1, actor->scale); // Bounce up in air actor->momz = FixedMul(locvar1, actor->scale); // Bounce up in air
actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y) + (P_Random() & 1 ? -prandom : +prandom); // Pick a direction, and randomize it. actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y) + (P_RandomChance(FRACUNIT/2) ? -prandom : +prandom); // Pick a direction, and randomize it.
P_InstaThrust(actor, actor->angle+ANGLE_180, FixedMul(FixedMul(actor->info->speed,(locvar2)), actor->scale)); // Move at wandering speed P_InstaThrust(actor, actor->angle+ANGLE_180, FixedMul(FixedMul(actor->info->speed,(locvar2)), actor->scale)); // Move at wandering speed
} }
// Try to land on top of the player. // Try to land on top of the player.
@ -6347,10 +6342,10 @@ void A_Boss2PogoTarget(mobj_t *actor)
// Wander semi-randomly towards the player to get closer. // Wander semi-randomly towards the player to get closer.
else else
{ {
UINT8 prandom = P_Random(); UINT8 prandom = P_RandomByte();
actor->z++; // unstick from the floor actor->z++; // unstick from the floor
actor->momz = FixedMul(locvar1, actor->scale); // Bounce up in air actor->momz = FixedMul(locvar1, actor->scale); // Bounce up in air
actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y) + (P_Random() & 1 ? -prandom : +prandom); // Pick a direction, and randomize it. actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y) + (P_RandomChance(FRACUNIT/2) ? -prandom : +prandom); // Pick a direction, and randomize it.
P_InstaThrust(actor, actor->angle, FixedMul(FixedMul(actor->info->speed,(locvar2)), actor->scale)); // Move at wandering speed P_InstaThrust(actor, actor->angle, FixedMul(FixedMul(actor->info->speed,(locvar2)), actor->scale)); // Move at wandering speed
} }
// Boing! // Boing!
@ -7084,7 +7079,7 @@ void A_SmokeTrailer(mobj_t *actor)
P_SetObjectMomZ(th, FRACUNIT, false); P_SetObjectMomZ(th, FRACUNIT, false);
th->destscale = actor->scale; th->destscale = actor->scale;
P_SetScale(th, actor->scale); P_SetScale(th, actor->scale);
th->tics -= P_Random() & 3; th->tics -= P_RandomByte() & 3;
if (th->tics < 1) if (th->tics < 1)
th->tics = 1; th->tics = 1;
} }
@ -7183,7 +7178,7 @@ void A_ChangeAngleRelative(mobj_t *actor)
// rather than the ranges, so <0 and >360 work as possible values. -Red // rather than the ranges, so <0 and >360 work as possible values. -Red
INT32 locvar1 = var1; INT32 locvar1 = var1;
INT32 locvar2 = var2; INT32 locvar2 = var2;
//angle_t angle = (P_Random()+1)<<24; //angle_t angle = (P_RandomByte()+1)<<24;
const fixed_t amin = locvar1*FRACUNIT; const fixed_t amin = locvar1*FRACUNIT;
const fixed_t amax = locvar2*FRACUNIT; const fixed_t amax = locvar2*FRACUNIT;
//const angle_t amin = FixedAngle(locvar1*FRACUNIT); //const angle_t amin = FixedAngle(locvar1*FRACUNIT);
@ -7217,7 +7212,7 @@ void A_ChangeAngleAbsolute(mobj_t *actor)
{ {
INT32 locvar1 = var1; INT32 locvar1 = var1;
INT32 locvar2 = var2; INT32 locvar2 = var2;
//angle_t angle = (P_Random()+1)<<24; //angle_t angle = (P_RandomByte()+1)<<24;
const fixed_t amin = locvar1*FRACUNIT; const fixed_t amin = locvar1*FRACUNIT;
const fixed_t amax = locvar2*FRACUNIT; const fixed_t amax = locvar2*FRACUNIT;
//const angle_t amin = FixedAngle(locvar1*FRACUNIT); //const angle_t amin = FixedAngle(locvar1*FRACUNIT);
@ -7825,7 +7820,7 @@ void A_RandomState(mobj_t *actor)
return; return;
#endif #endif
P_SetMobjState(actor, P_Random()&1 ? locvar1 : locvar2); P_SetMobjState(actor, P_RandomChance(FRACUNIT/2) ? locvar1 : locvar2);
} }
// Function: A_RandomStateRange // Function: A_RandomStateRange
@ -8516,34 +8511,29 @@ void A_SearchForPlayers(mobj_t *actor)
// Function: A_CheckRandom // Function: A_CheckRandom
// //
// Description: Calls a state by chance (around 1/var1). // Description: Calls a state by chance.
// //
// var1 = denominator (can't exceed 100) // var1:
// lower 16 bits = denominator
// upper 16 bits = numerator (defaults to 1 if zero)
// var2 = state number // var2 = state number
// //
void A_CheckRandom(mobj_t *actor) void A_CheckRandom(mobj_t *actor)
{ {
INT32 locvar1 = var1; INT32 locvar1 = var1;
INT32 locvar2 = var2; INT32 locvar2 = var2;
INT32 i, chance; fixed_t chance = FRACUNIT;
INT32 rndadd = 0;
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
if (LUA_CallAction("A_CheckRandom", actor)) if (LUA_CallAction("A_CheckRandom", actor))
return; return;
#endif #endif
// The PRNG doesn't suck anymore, OK?
if (locvar1 >> 16)
chance *= (locvar1 >> 16);
chance /= (locvar1 & 0xFFFF);
if(locvar1 > 100) if (P_RandomChance(chance))
locvar1 = 100;
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i])
rndadd += abs((int)players[i].mo->x) + abs((int)players[i].mo->y) + abs((int)players[i].mo->z);
rndadd = rndadd % 10000; //additional component to enlarge random number
chance = (P_Random() + rndadd) % locvar1;
if (chance == 0)
P_SetMobjState(actor, locvar2); P_SetMobjState(actor, locvar2);
} }
@ -9890,7 +9880,7 @@ void A_BrakChase(mobj_t *actor)
S_StartSound(actor, (sfxenum_t)locvar2); S_StartSound(actor, (sfxenum_t)locvar2);
// make active sound // make active sound
if (actor->type != MT_CYBRAKDEMON && actor->info->activesound && P_Random() < 3) if (actor->type != MT_CYBRAKDEMON && actor->info->activesound && P_RandomChance(3*FRACUNIT/256))
{ {
S_StartSound(actor, actor->info->activesound); S_StartSound(actor, actor->info->activesound);
} }

28
src/p_inter.c
View file

@ -1236,7 +1236,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (special->target && special->target->state == &states[S_BLACKEGG_SHOOT1]) if (special->target && special->target->state == &states[S_BLACKEGG_SHOOT1])
{ {
if (special->target->health <= 2 && (P_Random() & 1)) if (special->target->health <= 2 && P_RandomChance(FRACUNIT/2))
P_SetMobjState(special->target, special->target->info->missilestate); P_SetMobjState(special->target, special->target->info->missilestate);
else else
P_SetMobjState(special->target, special->target->info->raisestate); P_SetMobjState(special->target, special->target->info->raisestate);
@ -2186,8 +2186,11 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
default: default:
if (target->info->doomednum) if (target->info->doomednum)
{ prandom = target->info->doomednum%5; // "Random" animal for new enemies.
switch(target->info->doomednum%5) else
prandom = P_RandomKey(5); // No placable object, just use a random number.
switch(prandom)
{ {
default: item = MT_BUNNY; break; default: item = MT_BUNNY; break;
case 1: item = MT_BIRD; break; case 1: item = MT_BIRD; break;
@ -2195,21 +2198,6 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
case 3: item = MT_COW; break; case 3: item = MT_COW; break;
case 4: item = MT_CHICKEN; break; case 4: item = MT_CHICKEN; break;
} }
}
else
{
prandom = P_Random();
if (prandom < 51)
item = MT_BUNNY;
else if (prandom < 102)
item = MT_BIRD;
else if (prandom < 153)
item = MT_MOUSE;
else if (prandom < 204)
item = MT_COW;
else
item = MT_CHICKEN;
}
break; break;
} }
} }
@ -3086,7 +3074,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
// Killing dead. Just for kicks. // Killing dead. Just for kicks.
// Require source and inflictor be player. Don't hurt for firing rings. // Require source and inflictor be player. Don't hurt for firing rings.
if (cv_killingdead.value && (source && source->player) && (inflictor && inflictor->player) && P_Random() < 80) if (cv_killingdead.value && (source && source->player) && (inflictor && inflictor->player) && P_RandomChance(5*FRACUNIT/16))
P_DamageMobj(source, target, target, 1); P_DamageMobj(source, target, target, 1);
// do the damage // do the damage
@ -3600,7 +3588,7 @@ void P_PlayerFlagBurst(player_t *player, boolean toss)
P_InstaThrust(flag, player->mo->angle, FixedMul(6*FRACUNIT, player->mo->scale)); P_InstaThrust(flag, player->mo->angle, FixedMul(6*FRACUNIT, player->mo->scale));
else else
{ {
angle_t fa = P_Random()*FINEANGLES/256; angle_t fa = P_RandomByte()*FINEANGLES/256;
flag->momx = FixedMul(FINECOSINE(fa), FixedMul(6*FRACUNIT, player->mo->scale)); flag->momx = FixedMul(FINECOSINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));
if (!(twodlevel || (player->mo->flags2 & MF2_TWOD))) if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
flag->momy = FixedMul(FINESINE(fa), FixedMul(6*FRACUNIT, player->mo->scale)); flag->momy = FixedMul(FINESINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));

4
src/p_lights.c
View file

@ -51,7 +51,7 @@ void T_FireFlicker(fireflicker_t *flick)
if (--flick->count) if (--flick->count)
return; return;
amount = (INT16)((UINT8)(P_Random() & 3) * 16); amount = (INT16)((UINT8)(P_RandomByte() & 3) * 16);
if (flick->sector->lightlevel - amount < flick->minlight) if (flick->sector->lightlevel - amount < flick->minlight)
flick->sector->lightlevel = (INT16)flick->minlight; flick->sector->lightlevel = (INT16)flick->minlight;
@ -235,7 +235,7 @@ strobe_t *P_SpawnAdjustableStrobeFlash(sector_t *minsector, sector_t *maxsector,
flash->minlight = 0; flash->minlight = 0;
if (!inSync) if (!inSync)
flash->count = (P_Random() & 7) + 1; flash->count = (P_RandomByte() & 7) + 1;
else else
flash->count = 1; flash->count = 1;

70
src/p_mobj.c
View file

@ -652,9 +652,9 @@ void P_EmeraldManager(void)
break; break;
if (leveltime < TICRATE) // Start of map if (leveltime < TICRATE) // Start of map
spawnpoints[j]->threshold = 60*TICRATE + P_Random() * (TICRATE/5); spawnpoints[j]->threshold = 60*TICRATE + P_RandomByte() * (TICRATE/5);
else else
spawnpoints[j]->threshold = P_Random() * (TICRATE/5); spawnpoints[j]->threshold = P_RandomByte() * (TICRATE/5);
break; break;
} }
@ -683,26 +683,26 @@ void P_ExplodeMissile(mobj_t *mo)
explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE);
P_SetScale(explodemo, mo->scale); P_SetScale(explodemo, mo->scale);
explodemo->destscale = mo->destscale; explodemo->destscale = mo->destscale;
explodemo->momx += (P_Random() % 32) * FixedMul(FRACUNIT/8, explodemo->scale); explodemo->momx += (P_RandomByte() % 32) * FixedMul(FRACUNIT/8, explodemo->scale);
explodemo->momy += (P_Random() % 32) * FixedMul(FRACUNIT/8, explodemo->scale); explodemo->momy += (P_RandomByte() % 32) * FixedMul(FRACUNIT/8, explodemo->scale);
S_StartSound(explodemo, sfx_pop); S_StartSound(explodemo, sfx_pop);
explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE);
P_SetScale(explodemo, mo->scale); P_SetScale(explodemo, mo->scale);
explodemo->destscale = mo->destscale; explodemo->destscale = mo->destscale;
explodemo->momx += (P_Random() % 64) * FixedMul(FRACUNIT/8, explodemo->scale); explodemo->momx += (P_RandomByte() % 64) * FixedMul(FRACUNIT/8, explodemo->scale);
explodemo->momy -= (P_Random() % 64) * FixedMul(FRACUNIT/8, explodemo->scale); explodemo->momy -= (P_RandomByte() % 64) * FixedMul(FRACUNIT/8, explodemo->scale);
S_StartSound(explodemo, sfx_dmpain); S_StartSound(explodemo, sfx_dmpain);
explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE);
P_SetScale(explodemo, mo->scale); P_SetScale(explodemo, mo->scale);
explodemo->destscale = mo->destscale; explodemo->destscale = mo->destscale;
explodemo->momx -= (P_Random() % 128) * FixedMul(FRACUNIT/8, explodemo->scale); explodemo->momx -= (P_RandomByte() % 128) * FixedMul(FRACUNIT/8, explodemo->scale);
explodemo->momy += (P_Random() % 128) * FixedMul(FRACUNIT/8, explodemo->scale); explodemo->momy += (P_RandomByte() % 128) * FixedMul(FRACUNIT/8, explodemo->scale);
S_StartSound(explodemo, sfx_pop); S_StartSound(explodemo, sfx_pop);
explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE);
P_SetScale(explodemo, mo->scale); P_SetScale(explodemo, mo->scale);
explodemo->destscale = mo->destscale; explodemo->destscale = mo->destscale;
explodemo->momx -= (P_Random() % 96) * FixedMul(FRACUNIT/8, explodemo->scale); explodemo->momx -= (P_RandomByte() % 96) * FixedMul(FRACUNIT/8, explodemo->scale);
explodemo->momy -= (P_Random() % 96) * FixedMul(FRACUNIT/8, explodemo->scale); explodemo->momy -= (P_RandomByte() % 96) * FixedMul(FRACUNIT/8, explodemo->scale);
S_StartSound(explodemo, sfx_cybdth); S_StartSound(explodemo, sfx_cybdth);
// Hack: Release an animal. // Hack: Release an animal.
@ -2405,12 +2405,12 @@ static boolean P_ZMovement(mobj_t *mo)
// If deafed, give the tumbleweed another random kick if it runs out of steam. // If deafed, give the tumbleweed another random kick if it runs out of steam.
mom.z += P_MobjFlip(mo)*FixedMul(6*FRACUNIT, mo->scale); mom.z += P_MobjFlip(mo)*FixedMul(6*FRACUNIT, mo->scale);
if (P_Random() & 1) if (P_RandomChance(FRACUNIT/2))
mom.x += FixedMul(6*FRACUNIT, mo->scale); mom.x += FixedMul(6*FRACUNIT, mo->scale);
else else
mom.x -= FixedMul(6*FRACUNIT, mo->scale); mom.x -= FixedMul(6*FRACUNIT, mo->scale);
if (P_Random() & 1) if (P_RandomChance(FRACUNIT/2))
mom.y += FixedMul(6*FRACUNIT, mo->scale); mom.y += FixedMul(6*FRACUNIT, mo->scale);
else else
mom.y -= FixedMul(6*FRACUNIT, mo->scale); mom.y -= FixedMul(6*FRACUNIT, mo->scale);
@ -2886,7 +2886,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
for (i = 0; i < 4; ++i) // split into four for (i = 0; i < 4; ++i) // split into four
{ {
prandom = P_Random(); prandom = P_RandomByte();
explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_SMALLBUBBLE); explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_SMALLBUBBLE);
explodemo->momx += ((prandom & 0x0F) << (FRACBITS-2)) * (i & 2 ? -1 : 1); explodemo->momx += ((prandom & 0x0F) << (FRACBITS-2)) * (i & 2 ? -1 : 1);
explodemo->momy += ((prandom & 0xF0) << (FRACBITS-6)) * (i & 1 ? -1 : 1); explodemo->momy += ((prandom & 0xF0) << (FRACBITS-6)) * (i & 1 ? -1 : 1);
@ -3218,13 +3218,13 @@ void P_MobjCheckWater(mobj_t *mobj)
// Create tons of bubbles // Create tons of bubbles
for (i = 0; i < bubblecount; i++) for (i = 0; i < bubblecount; i++)
{ {
// P_Random()s are called individually to allow consistency // P_RandomByte()s are called individually to allow consistency
// across various compilers, since the order of function calls // across various compilers, since the order of function calls
// in C is not part of the ANSI specification. // in C is not part of the ANSI specification.
prandom[0] = P_Random(); prandom[0] = P_RandomByte();
prandom[1] = P_Random(); prandom[1] = P_RandomByte();
prandom[2] = P_Random(); prandom[2] = P_RandomByte();
prandom[3] = P_Random(); prandom[3] = P_RandomByte();
bubbletype = MT_SMALLBUBBLE; bubbletype = MT_SMALLBUBBLE;
if (!(prandom[0] & 0x3)) // medium bubble chance up to 64 from 32 if (!(prandom[0] & 0x3)) // medium bubble chance up to 64 from 32
@ -3826,7 +3826,7 @@ boolean P_BossTargetPlayer(mobj_t *actor, boolean closest)
// first time init, this allow minimum lastlook changes // first time init, this allow minimum lastlook changes
if (actor->lastlook < 0) if (actor->lastlook < 0)
actor->lastlook = P_Random(); actor->lastlook = P_RandomByte();
actor->lastlook &= PLAYERSMASK; actor->lastlook &= PLAYERSMASK;
for( ; ; actor->lastlook = (actor->lastlook+1) & PLAYERSMASK) for( ; ; actor->lastlook = (actor->lastlook+1) & PLAYERSMASK)
@ -4707,7 +4707,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
if (mobj->state == &states[S_BLACKEGG_STND] && mobj->tics == mobj->state->tics) if (mobj->state == &states[S_BLACKEGG_STND] && mobj->tics == mobj->state->tics)
{ {
mobj->reactiontime += P_Random(); mobj->reactiontime += P_RandomByte();
if (mobj->health <= mobj->info->damage) if (mobj->health <= mobj->info->damage)
mobj->reactiontime /= 4; mobj->reactiontime /= 4;
@ -4901,7 +4901,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
if (mobj->tracer && mobj->tracer->type == MT_BOSS3WAYPOINT if (mobj->tracer && mobj->tracer->type == MT_BOSS3WAYPOINT
&& mobj->tracer->spawnpoint && (mobj->tracer->spawnpoint->options & 7) == waypointNum) && mobj->tracer->spawnpoint && (mobj->tracer->spawnpoint->options & 7) == waypointNum)
{ {
if (P_Random() & 1) if (P_RandomChance(FRACUNIT/2))
waypointNum++; waypointNum++;
else else
waypointNum--; waypointNum--;
@ -4913,7 +4913,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
} }
if (waypointNum == 0 && mobj->health <= mobj->info->damage) if (waypointNum == 0 && mobj->health <= mobj->info->damage)
waypointNum = 1 + (P_Random() & 1); waypointNum = 1 + (P_RandomFixed() & 1);
// scan the thinkers to find // scan the thinkers to find
// the waypoint to use // the waypoint to use
@ -5013,7 +5013,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
P_SetMobjState(mobj, mobj->info->spawnstate); P_SetMobjState(mobj, mobj->info->spawnstate);
} }
else if (mobj->state == &states[mobj->info->deathstate] && mobj->tics == mobj->state->tics) else if (mobj->state == &states[mobj->info->deathstate] && mobj->tics == mobj->state->tics)
S_StartSound(0, sfx_bedie1 + (P_Random() & 1)); S_StartSound(0, sfx_bedie1 + (P_RandomFixed() & 1));
} }
@ -5440,7 +5440,7 @@ static void P_Boss9Thinker(mobj_t *mobj)
// An incoming attack is detected! What should we do?! // An incoming attack is detected! What should we do?!
// Go into vector form! // Go into vector form!
mobj->movedir = ANGLE_11hh - FixedAngle(FixedMul(AngleFixed(ANGLE_11hh), FixedDiv((mobj->info->spawnhealth - mobj->health)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS))); mobj->movedir = ANGLE_11hh - FixedAngle(FixedMul(AngleFixed(ANGLE_11hh), FixedDiv((mobj->info->spawnhealth - mobj->health)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS)));
if (P_Random()&1) if (P_RandomChance(FRACUNIT/2))
mobj->movedir = InvAngle(mobj->movedir); mobj->movedir = InvAngle(mobj->movedir);
mobj->threshold = 6 + (FixedMul(24<<FRACBITS, FixedDiv((mobj->info->spawnhealth - mobj->health)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS))>>FRACBITS); mobj->threshold = 6 + (FixedMul(24<<FRACBITS, FixedDiv((mobj->info->spawnhealth - mobj->health)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS))>>FRACBITS);
if (mobj->info->activesound) if (mobj->info->activesound)
@ -6042,20 +6042,20 @@ static void P_KoopaThinker(mobj_t *koopa)
P_XYMovement(koopa); P_XYMovement(koopa);
if (P_Random() < 8 && koopa->z <= koopa->floorz) if (P_RandomChance(FRACUNIT/32) && koopa->z <= koopa->floorz)
koopa->momz = FixedMul(5*FRACUNIT, koopa->scale); koopa->momz = FixedMul(5*FRACUNIT, koopa->scale);
if (koopa->z > koopa->floorz) if (koopa->z > koopa->floorz)
koopa->momz += FixedMul(FRACUNIT/4, koopa->scale); koopa->momz += FixedMul(FRACUNIT/4, koopa->scale);
if (P_Random() < 4) if (P_RandomChance(FRACUNIT/64))
{ {
mobj_t *flame; mobj_t *flame;
flame = P_SpawnMobj(koopa->x - koopa->radius + FixedMul(5*FRACUNIT, koopa->scale), koopa->y, koopa->z + (P_Random()<<(FRACBITS-2)), MT_KOOPAFLAME); flame = P_SpawnMobj(koopa->x - koopa->radius + FixedMul(5*FRACUNIT, koopa->scale), koopa->y, koopa->z + (P_RandomByte()<<(FRACBITS-2)), MT_KOOPAFLAME);
flame->momx = -FixedMul(flame->info->speed, flame->scale); flame->momx = -FixedMul(flame->info->speed, flame->scale);
S_StartSound(flame, sfx_koopfr); S_StartSound(flame, sfx_koopfr);
} }
else if (P_Random() > 250) else if (P_RandomChance(5*FRACUNIT/256))
{ {
mobj_t *hammer; mobj_t *hammer;
hammer = P_SpawnMobj(koopa->x - koopa->radius, koopa->y, koopa->z + koopa->height, MT_HAMMER); hammer = P_SpawnMobj(koopa->x - koopa->radius, koopa->y, koopa->z + koopa->height, MT_HAMMER);
@ -6499,11 +6499,11 @@ void P_MobjThinker(mobj_t *mobj)
fixed_t ns; fixed_t ns;
mobj_t *mo2; mobj_t *mo2;
i = P_Random(); i = P_RandomByte();
z = mobj->subsector->sector->floorheight + ((P_Random()&63)*FRACUNIT); z = mobj->subsector->sector->floorheight + ((P_RandomByte()&63)*FRACUNIT);
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++)
{ {
const angle_t fa = (P_Random()*FINEANGLES/16) & FINEMASK; const angle_t fa = (P_RandomByte()*FINEANGLES/16) & FINEMASK;
ns = 64 * FRACUNIT; ns = 64 * FRACUNIT;
x = mobj->x + FixedMul(FINESINE(fa),ns); x = mobj->x + FixedMul(FINESINE(fa),ns);
y = mobj->y + FixedMul(FINECOSINE(fa),ns); y = mobj->y + FixedMul(FINECOSINE(fa),ns);
@ -6513,7 +6513,7 @@ void P_MobjThinker(mobj_t *mobj)
mo2->momx = FixedMul(FINESINE(fa),ns); mo2->momx = FixedMul(FINESINE(fa),ns);
mo2->momy = FixedMul(FINECOSINE(fa),ns); mo2->momy = FixedMul(FINECOSINE(fa),ns);
i = P_Random(); i = P_RandomByte();
if (i % 5 == 0) if (i % 5 == 0)
P_SpawnMobj(x, y, z, MT_CHICKEN); P_SpawnMobj(x, y, z, MT_CHICKEN);
@ -7997,7 +7997,7 @@ void P_SpawnPrecipitation(void)
continue; continue;
rainmo = P_SpawnSnowMobj(x, y, height, MT_SNOWFLAKE); rainmo = P_SpawnSnowMobj(x, y, height, MT_SNOWFLAKE);
mrand = M_Random(); mrand = M_RandomByte();
if (mrand < 64) if (mrand < 64)
P_SetPrecipMobjState(rainmo, S_SNOW3); P_SetPrecipMobjState(rainmo, S_SNOW3);
else if (mrand < 144) else if (mrand < 144)
@ -9166,12 +9166,12 @@ ML_NOCLIMB : Direction not controllable
{ {
mobj->momz += FixedMul(16*FRACUNIT, mobj->scale); mobj->momz += FixedMul(16*FRACUNIT, mobj->scale);
if (P_Random() & 1) if (P_RandomChance(FRACUNIT/2))
mobj->momx += FixedMul(16*FRACUNIT, mobj->scale); mobj->momx += FixedMul(16*FRACUNIT, mobj->scale);
else else
mobj->momx -= FixedMul(16*FRACUNIT, mobj->scale); mobj->momx -= FixedMul(16*FRACUNIT, mobj->scale);
if (P_Random() & 1) if (P_RandomChance(FRACUNIT/2))
mobj->momy += FixedMul(16*FRACUNIT, mobj->scale); mobj->momy += FixedMul(16*FRACUNIT, mobj->scale);
else else
mobj->momy -= FixedMul(16*FRACUNIT,mobj->scale); mobj->momy -= FixedMul(16*FRACUNIT,mobj->scale);

2
src/p_spec.c
View file

@ -2057,7 +2057,7 @@ void P_SwitchWeather(INT32 weathernum)
precipmobj = (precipmobj_t *)think; precipmobj = (precipmobj_t *)think;
precipmobj->flags = mobjinfo[MT_SNOWFLAKE].flags; precipmobj->flags = mobjinfo[MT_SNOWFLAKE].flags;
z = M_Random(); z = M_RandomByte();
if (z < 64) if (z < 64)
z = 2; z = 2;

4
src/p_tick.c
View file

@ -363,7 +363,7 @@ static void P_DoAutobalanceTeams(void)
{ {
if (totalred > totalblue) if (totalred > totalblue)
{ {
i = M_Random() % red; i = M_RandomKey(red);
NetPacket.packet.newteam = 2; NetPacket.packet.newteam = 2;
NetPacket.packet.playernum = redarray[i]; NetPacket.packet.playernum = redarray[i];
NetPacket.packet.verification = true; NetPacket.packet.verification = true;
@ -375,7 +375,7 @@ static void P_DoAutobalanceTeams(void)
if (totalblue > totalred) if (totalblue > totalred)
{ {
i = M_Random() % blue; i = M_RandomKey(blue);
NetPacket.packet.newteam = 1; NetPacket.packet.newteam = 1;
NetPacket.packet.playernum = bluearray[i]; NetPacket.packet.playernum = bluearray[i];
NetPacket.packet.verification = true; NetPacket.packet.verification = true;

10
src/p_user.c
View file

@ -2172,9 +2172,9 @@ static void P_DoBubbleBreath(player_t *player)
if (!(player->mo->eflags & MFE_UNDERWATER) || ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL && !(player->pflags & PF_NIGHTSMODE)) || player->spectator) if (!(player->mo->eflags & MFE_UNDERWATER) || ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL && !(player->pflags & PF_NIGHTSMODE)) || player->spectator)
return; return;
if (!(P_Random() % 16)) if (P_RandomChance(FRACUNIT/16))
bubble = P_SpawnMobj(player->mo->x, player->mo->y, zh, MT_SMALLBUBBLE); bubble = P_SpawnMobj(player->mo->x, player->mo->y, zh, MT_SMALLBUBBLE);
else if (!(P_Random() % 96)) else if (P_RandomChance(3*FRACUNIT/256))
bubble = P_SpawnMobj(player->mo->x, player->mo->y, zh, MT_MEDIUMBUBBLE); bubble = P_SpawnMobj(player->mo->x, player->mo->y, zh, MT_MEDIUMBUBBLE);
if (bubble) if (bubble)
{ {
@ -6620,7 +6620,7 @@ static void P_MovePlayer(player_t *player)
// Little water sound while touching water - just a nicety. // Little water sound while touching water - just a nicety.
if ((player->mo->eflags & MFE_TOUCHWATER) && !(player->mo->eflags & MFE_UNDERWATER) && !player->spectator) if ((player->mo->eflags & MFE_TOUCHWATER) && !(player->mo->eflags & MFE_UNDERWATER) && !player->spectator)
{ {
if (P_Random() & 1 && leveltime % TICRATE == 0) if (P_RandomChance(FRACUNIT/2) && leveltime % TICRATE == 0)
S_StartSound(player->mo, sfx_floush); S_StartSound(player->mo, sfx_floush);
} }
@ -8423,7 +8423,7 @@ static boolean P_SpectatorJoinGame(player_t *player)
else if (redscore > bluescore) else if (redscore > bluescore)
changeto = 2; changeto = 2;
else else
changeto = (P_Random() & 1) + 1; changeto = (P_RandomFixed() & 1) + 1;
if (player->mo) if (player->mo)
{ {
@ -8674,7 +8674,7 @@ void P_PlayerThink(player_t *player)
// Add some extra randomization. // Add some extra randomization.
if (cmd->forwardmove) if (cmd->forwardmove)
P_Random(); P_RandomFixed();
#ifdef PARANOIA #ifdef PARANOIA
if (player->playerstate == PST_REBORN) if (player->playerstate == PST_REBORN)

2
src/v_video.c
View file

@ -1967,7 +1967,7 @@ Unoptimized version
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {
if (M_Random() < 32) if (M_RandomChance(FRACUNIT/8)) // 12.5%
heatshifter[y] = true; heatshifter[y] = true;
} }