ensure deterministic order for P_Random stuff passed as arguments
the evaluation order of arguments passed to functions is undefined in C/C++, so its up to the compiler in which order to evaluate these P_Random functions modify the randomseed each time theyre called, which can lead to different outcomes (thus desynchs) on different platforms, compilers, compiler versions etc. so match up with the most common which is last to first (seemingly the order gcc on nix and windows handle it)
This commit is contained in:
1 parent
19c97d3137
commit
b21396bd34
3 files changed
+130
-42
No files matched your search
+32
-16
@@ -2920,6 +2920,7 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
|
||||
mobj_t *dust;
|
||||
mobj_t *truc;
|
||||
INT32 speed, speed2;
|
||||
fixed_t rand_x, rand_y, rand_z;
|
||||
|
||||
INT32 i, radius, height;
|
||||
mobj_t *smoldering = P_SpawnMobj(source->x, source->y, source->z, MT_SMOLDERING);
|
||||
@@ -2942,9 +2943,11 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
|
||||
dust->scalespeed = source->scale/12;
|
||||
P_InstaThrust(dust, dust->angle, FixedMul(20*FRACUNIT, source->scale));
|
||||
|
||||
truc = P_SpawnMobj(source->x + P_RandomRange(-radius, radius)*FRACUNIT,
|
||||
source->y + P_RandomRange(-radius, radius)*FRACUNIT,
|
||||
source->z + P_RandomRange(0, height)*FRACUNIT, MT_BOOMEXPLODE);
|
||||
rand_z = source->z + P_RandomRange(0, height)*FRACUNIT;
|
||||
rand_y = source->y + P_RandomRange(-radius, radius)*FRACUNIT;
|
||||
rand_x = source->x + P_RandomRange(-radius, radius)*FRACUNIT;
|
||||
|
||||
truc = P_SpawnMobj(rand_x, rand_y, rand_z, MT_BOOMEXPLODE);
|
||||
K_MatchGenericExtraFlags(truc, source);
|
||||
P_SetScale(truc, source->scale);
|
||||
truc->destscale = source->scale*6;
|
||||
@@ -2961,9 +2964,11 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
|
||||
|
||||
for (i = 0; i < 16; i++)
|
||||
{
|
||||
dust = P_SpawnMobj(source->x + P_RandomRange(-radius, radius)*FRACUNIT,
|
||||
source->y + P_RandomRange(-radius, radius)*FRACUNIT,
|
||||
source->z + P_RandomRange(0, height)*FRACUNIT, MT_SMOKE);
|
||||
rand_z = source->z + P_RandomRange(0, height)*FRACUNIT;
|
||||
rand_y = source->y + P_RandomRange(-radius, radius)*FRACUNIT;
|
||||
rand_x = source->x + P_RandomRange(-radius, radius)*FRACUNIT;
|
||||
|
||||
dust = P_SpawnMobj(rand_x, rand_y, rand_z, MT_SMOKE);
|
||||
P_SetMobjState(dust, S_OPAQUESMOKE1);
|
||||
P_SetScale(dust, source->scale);
|
||||
dust->destscale = source->scale*10;
|
||||
@@ -2971,9 +2976,11 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
|
||||
dust->tics = 30;
|
||||
dust->momz = P_RandomRange(FixedMul(3*FRACUNIT, source->scale)>>FRACBITS, FixedMul(7*FRACUNIT, source->scale)>>FRACBITS)*FRACUNIT;
|
||||
|
||||
truc = P_SpawnMobj(source->x + P_RandomRange(-radius, radius)*FRACUNIT,
|
||||
source->y + P_RandomRange(-radius, radius)*FRACUNIT,
|
||||
source->z + P_RandomRange(0, height)*FRACUNIT, MT_BOOMPARTICLE);
|
||||
rand_z = source->z + P_RandomRange(0, height)*FRACUNIT;
|
||||
rand_y = source->y + P_RandomRange(-radius, radius)*FRACUNIT;
|
||||
rand_x = source->x + P_RandomRange(-radius, radius)*FRACUNIT;
|
||||
|
||||
truc = P_SpawnMobj(rand_x, rand_y, rand_z, MT_BOOMPARTICLE);
|
||||
K_MatchGenericExtraFlags(truc, source);
|
||||
P_SetScale(truc, source->scale);
|
||||
truc->destscale = source->scale*5;
|
||||
@@ -3630,9 +3637,13 @@ void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
|
||||
else
|
||||
aoff += ANGLE_45;
|
||||
|
||||
dust = P_SpawnMobj(mo->x + FixedMul(24*mo->scale, FINECOSINE(aoff>>ANGLETOFINESHIFT)) + (P_RandomRange(-8,8) << FRACBITS),
|
||||
mo->y + FixedMul(24*mo->scale, FINESINE(aoff>>ANGLETOFINESHIFT)) + (P_RandomRange(-8,8) << FRACBITS),
|
||||
mo->z, MT_WIPEOUTTRAIL);
|
||||
fixed_t rand_x;
|
||||
fixed_t rand_y;
|
||||
|
||||
rand_y = mo->y + FixedMul(24*mo->scale, FINESINE(aoff>>ANGLETOFINESHIFT)) + (P_RandomRange(-8,8) << FRACBITS);
|
||||
rand_x = mo->x + FixedMul(24*mo->scale, FINECOSINE(aoff>>ANGLETOFINESHIFT)) + (P_RandomRange(-8,8) << FRACBITS);
|
||||
|
||||
dust = P_SpawnMobj(rand_x, rand_y, mo->z, MT_WIPEOUTTRAIL);
|
||||
|
||||
P_SetTarget(&dust->target, mo);
|
||||
dust->angle = R_PointToAngle2(0,0,mo->momx,mo->momy);
|
||||
@@ -5426,10 +5437,15 @@ FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, bool
|
||||
{
|
||||
randomFunc randomfunc = synched ? P_RandomRange : M_RandomRange;
|
||||
|
||||
mobj_t *fast = P_SpawnMobj(player->mo->x + (randomfunc(-36,36) * player->mo->scale),
|
||||
player->mo->y + (randomfunc(-36,36) * player->mo->scale),
|
||||
player->mo->z + (player->mo->height/2) + (randomfunc(-20,20) * player->mo->scale),
|
||||
MT_FASTLINE);
|
||||
fixed_t rand_x;
|
||||
fixed_t rand_y;
|
||||
fixed_t rand_z;
|
||||
|
||||
rand_z = player->mo->z + (player->mo->height/2) + (randomfunc(-20,20) * player->mo->scale);
|
||||
rand_y = player->mo->y + (randomfunc(-36,36) * player->mo->scale);
|
||||
rand_x = player->mo->x + (randomfunc(-36,36) * player->mo->scale);
|
||||
|
||||
mobj_t *fast = P_SpawnMobj(rand_x, rand_y, rand_z, MT_FASTLINE);
|
||||
|
||||
fast->angle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
|
||||
fast->momx = 3*player->mo->momx/4;
|
||||
|
||||
+54
-16
@@ -8035,8 +8035,15 @@ void A_JawzExplode(void *thing)
|
||||
{
|
||||
INT32 speed, speed2;
|
||||
|
||||
truc = P_SpawnMobj(actor->x + P_RandomRange(-8, 8)*FRACUNIT, actor->y + P_RandomRange(-8, 8)*FRACUNIT,
|
||||
actor->z + P_RandomRange(0, 8)*FRACUNIT, MT_BOOMPARTICLE);
|
||||
fixed_t rand_x;
|
||||
fixed_t rand_y;
|
||||
fixed_t rand_z;
|
||||
|
||||
rand_z = actor->z + P_RandomRange(0, 8)*FRACUNIT;
|
||||
rand_y = actor->y + P_RandomRange(-8, 8)*FRACUNIT;
|
||||
rand_x = actor->x + P_RandomRange(-8, 8)*FRACUNIT;
|
||||
|
||||
truc = P_SpawnMobj(rand_x, rand_y, rand_z, MT_BOOMPARTICLE);
|
||||
truc->scale = actor->scale*2;
|
||||
|
||||
speed = FixedMul(7*FRACUNIT, actor->scale)>>FRACBITS;
|
||||
@@ -8205,10 +8212,16 @@ void A_SPBChase(void *thing)
|
||||
: (16*R_PointToDist2(0, 0, actor->tracer->momx, actor->tracer->momy))/15) // Going faster than the target
|
||||
&& xyspeed > K_GetKartSpeed(actor->tracer->player, false)/4) // Don't display speedup lines at pitifully low speeds
|
||||
{
|
||||
mobj_t *fast = P_SpawnMobj(actor->x + (P_RandomRange(-24,24) * actor->scale),
|
||||
actor->y + (P_RandomRange(-24,24) * actor->scale),
|
||||
actor->z + (actor->height/2) + (P_RandomRange(-24,24) * actor->scale),
|
||||
MT_FASTLINE);
|
||||
|
||||
fixed_t rand_x;
|
||||
fixed_t rand_y;
|
||||
fixed_t rand_z;
|
||||
|
||||
rand_z = actor->z + (actor->height/2) + (P_RandomRange(-24,24) * actor->scale);
|
||||
rand_y = actor->y + (P_RandomRange(-24,24) * actor->scale);
|
||||
rand_x = actor->x + (P_RandomRange(-24,24) * actor->scale);
|
||||
|
||||
mobj_t *fast = P_SpawnMobj(rand_x, rand_y, rand_z, MT_FASTLINE);
|
||||
fast->angle = R_PointToAngle2(0, 0, actor->momx, actor->momy);
|
||||
//fast->momx = (3*actor->momx)/4;
|
||||
//fast->momy = (3*actor->momy)/4;
|
||||
@@ -8416,8 +8429,15 @@ void A_FZBoomSmoke(void *thing)
|
||||
|
||||
for (i = 0; i < 8+(4*var1); i++)
|
||||
{
|
||||
mobj_t *smoke = P_SpawnMobj(actor->x + (P_RandomRange(-rad, rad)*actor->scale), actor->y + (P_RandomRange(-rad, rad)*actor->scale),
|
||||
actor->z + (P_RandomRange(0, 72)*actor->scale), MT_THOK);
|
||||
fixed_t rand_x;
|
||||
fixed_t rand_y;
|
||||
fixed_t rand_z;
|
||||
|
||||
rand_z = actor->z + (P_RandomRange(0, 72)*actor->scale);
|
||||
rand_y = actor->y + (P_RandomRange(-rad, rad)*actor->scale);
|
||||
rand_x = actor->x + (P_RandomRange(-rad, rad)*actor->scale);
|
||||
|
||||
mobj_t *smoke = P_SpawnMobj(rand_x, rand_y, rand_z, MT_THOK);
|
||||
|
||||
P_SetMobjState(smoke, S_FZEROSMOKE1);
|
||||
smoke->tics += P_RandomRange(-3, 4);
|
||||
@@ -8593,7 +8613,15 @@ void A_MementosTPParticles(void *thing)
|
||||
|
||||
for (; i < 4; i++)
|
||||
{
|
||||
particle = P_SpawnMobj(actor->x + (P_RandomRange(-256, 256)<<FRACBITS), actor->y + (P_RandomRange(-256, 256)<<FRACBITS), actor->z + (P_RandomRange(48, 256)<<FRACBITS), MT_MEMENTOSPARTICLE);
|
||||
fixed_t rand_x;
|
||||
fixed_t rand_y;
|
||||
fixed_t rand_z;
|
||||
|
||||
rand_z = actor->z + (P_RandomRange(48, 256)<<FRACBITS);
|
||||
rand_y = actor->y + (P_RandomRange(-256, 256)<<FRACBITS);
|
||||
rand_x = actor->x + (P_RandomRange(-256, 256)<<FRACBITS);
|
||||
|
||||
particle = P_SpawnMobj(rand_x, rand_y, rand_z, MT_MEMENTOSPARTICLE);
|
||||
particle->frame = 0;
|
||||
particle->color = ((i%2) ? (SKINCOLOR_RED) : (SKINCOLOR_BLACK));
|
||||
particle->destscale = 1;
|
||||
@@ -8656,9 +8684,15 @@ void A_ReaperThinker(void *thing)
|
||||
if (actor->scale < 2<<FRACBITS) // we haven't finished growing YET.
|
||||
{
|
||||
// Spawn particles as we grow out of the floor, ゴ ゴ ゴ ゴ
|
||||
for (; i<16; i++)
|
||||
for (; i < 16; i++)
|
||||
{
|
||||
particle = P_SpawnMobj(actor->x + (P_RandomRange(-60, 60)<<FRACBITS), actor->y + (P_RandomRange(-60, 60)<<FRACBITS), actor->z, MT_THOK);
|
||||
fixed_t rand_x;
|
||||
fixed_t rand_y;
|
||||
|
||||
rand_y = actor->y + (P_RandomRange(-60, 60)<<FRACBITS);
|
||||
rand_x = actor->x + (P_RandomRange(-60, 60)<<FRACBITS);
|
||||
|
||||
particle = P_SpawnMobj(rand_x, rand_y, actor->z, MT_THOK);
|
||||
particle->momz = 20<<FRACBITS;
|
||||
particle->color = ((i%2 !=0) ? (SKINCOLOR_RED) : (SKINCOLOR_BLACK));
|
||||
particle->frame = 0;
|
||||
@@ -8813,11 +8847,15 @@ void A_FlameParticle(void *thing)
|
||||
if (LUA_CallAction(A_FLAMEPARTICLE, actor))
|
||||
return;
|
||||
|
||||
par = P_SpawnMobj(
|
||||
actor->x + (P_RandomRange(-rad, rad)<<FRACBITS),
|
||||
actor->y + (P_RandomRange(-rad, rad)<<FRACBITS),
|
||||
actor->z + (P_RandomRange(hei/2, hei)<<FRACBITS),
|
||||
actor->info->painchance);
|
||||
fixed_t rand_x;
|
||||
fixed_t rand_y;
|
||||
fixed_t rand_z;
|
||||
|
||||
rand_z = actor->z + (P_RandomRange(hei/2, hei)<<FRACBITS);
|
||||
rand_y = actor->y + (P_RandomRange(-rad, rad)<<FRACBITS);
|
||||
rand_x = actor->x + (P_RandomRange(-rad, rad)<<FRACBITS);
|
||||
|
||||
par = P_SpawnMobj(rand_x, rand_y, rand_z, actor->info->painchance);
|
||||
par->momz = actor->scale<<1;
|
||||
}
|
||||
|
||||
|
||||
+44
-10
@@ -6202,6 +6202,7 @@ static void P_MobjSceneryThink(mobj_t *mobj)
|
||||
fixed_t x = P_RandomRange(-35, 35)*mobj->scale;
|
||||
fixed_t y = P_RandomRange(-35, 35)*mobj->scale;
|
||||
fixed_t z = P_RandomRange(0, 70)*mobj->scale;
|
||||
|
||||
mobj_t *smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE);
|
||||
P_SetMobjState(smoke, S_OPAQUESMOKE1);
|
||||
K_MatchGenericExtraFlags(smoke, mobj);
|
||||
@@ -6215,6 +6216,7 @@ static void P_MobjSceneryThink(mobj_t *mobj)
|
||||
fixed_t x = P_RandomRange(-16, 16)*mobj->scale;
|
||||
fixed_t y = P_RandomRange(-16, 16)*mobj->scale;
|
||||
fixed_t z = P_RandomRange(0, 32)*mobj->scale*P_MobjFlip(mobj);
|
||||
|
||||
if (leveltime % 2 == 0)
|
||||
{
|
||||
mobj_t *smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_BOSSEXPLODE);
|
||||
@@ -7793,7 +7795,13 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
||||
smoke->momy = mobj->target->momy/2;
|
||||
smoke->momz = mobj->target->momz/2;
|
||||
|
||||
P_Thrust(smoke, mobj->angle+FixedAngle(P_RandomRange(135, 225)<<FRACBITS), P_RandomRange(0, 8) * mobj->target->scale);
|
||||
fixed_t rand_angle;
|
||||
fixed_t rand_move;
|
||||
|
||||
rand_move = P_RandomRange(0, 8) * mobj->target->scale;
|
||||
rand_angle = mobj->angle+FixedAngle(P_RandomRange(135, 225)<<FRACBITS);
|
||||
|
||||
P_Thrust(smoke, rand_angle, rand_move);
|
||||
}
|
||||
break;
|
||||
case MT_SPARKLETRAIL:
|
||||
@@ -8061,11 +8069,18 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
||||
}
|
||||
else
|
||||
{
|
||||
P_SpawnMobj(mobj->x + (P_RandomRange(-48,48)*mobj->scale),
|
||||
mobj->y + (P_RandomRange(-48,48)*mobj->scale),
|
||||
mobj->z + (24*mobj->scale) + (P_RandomRange(-8,8)*mobj->scale),
|
||||
MT_SIGNSPARKLE);
|
||||
fixed_t rand_x;
|
||||
fixed_t rand_y;
|
||||
fixed_t rand_z;
|
||||
|
||||
rand_z = mobj->z + (24*mobj->scale) + (P_RandomRange(-8,8)*mobj->scale);
|
||||
rand_y = mobj->y + (P_RandomRange(-48,48)*mobj->scale);
|
||||
rand_x = mobj->x + (P_RandomRange(-48,48)*mobj->scale);
|
||||
|
||||
P_SpawnMobj(rand_x, rand_y, rand_z, MT_SIGNSPARKLE);
|
||||
|
||||
mobj->flags &= ~MF_NOGRAVITY;
|
||||
|
||||
if (abs(mobj->z - mobj->movefactor) <= (512*mobj->scale) && !mobj->cvmem)
|
||||
{
|
||||
if (mobj->info->seesound)
|
||||
@@ -8095,6 +8110,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
||||
|
||||
{
|
||||
angle_t facing = P_RandomRange(0, 90);
|
||||
|
||||
if (facing >= 45)
|
||||
facing = InvAngle((facing - 45)*ANG1);
|
||||
else
|
||||
@@ -8127,7 +8143,14 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
||||
else // fire + smoke pillar
|
||||
{
|
||||
UINT8 i;
|
||||
mobj_t *fire = P_SpawnMobj(mobj->x + (P_RandomRange(-32, 32)*mobj->scale), mobj->y + (P_RandomRange(-32, 32)*mobj->scale), mobj->z, MT_THOK);
|
||||
|
||||
fixed_t rand_x;
|
||||
fixed_t rand_y;
|
||||
|
||||
rand_y = mobj->y + (P_RandomRange(-32, 32)*mobj->scale);
|
||||
rand_x = mobj->x + (P_RandomRange(-32, 32)*mobj->scale);
|
||||
|
||||
mobj_t *fire = P_SpawnMobj(rand_x, rand_y, mobj->z, MT_THOK);
|
||||
|
||||
fire->sprite = SPR_FPRT;
|
||||
fire->frame = FF_FULLBRIGHT|FF_TRANS30;
|
||||
@@ -8139,7 +8162,10 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
||||
|
||||
for (i = 0; i < 2; i++)
|
||||
{
|
||||
mobj_t *smoke = P_SpawnMobj(mobj->x + (P_RandomRange(-16, 16)*mobj->scale), mobj->y + (P_RandomRange(-16, 16)*mobj->scale), mobj->z, MT_SMOKE);
|
||||
rand_y = mobj->y + (P_RandomRange(-16, 16)*mobj->scale);
|
||||
rand_x = mobj->x + (P_RandomRange(-16, 16)*mobj->scale);
|
||||
|
||||
mobj_t *smoke = P_SpawnMobj(rand_x, rand_y, mobj->z, MT_SMOKE);
|
||||
|
||||
P_SetMobjState(smoke, S_FZSLOWSMOKE1);
|
||||
smoke->scale = mobj->scale;
|
||||
@@ -8164,8 +8190,10 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
||||
cur = cur->hnext;
|
||||
}
|
||||
}
|
||||
|
||||
if (!S_SoundPlaying(mobj, mobj->info->seesound))
|
||||
S_StartSound(mobj, mobj->info->seesound);
|
||||
|
||||
break;
|
||||
case MT_FROGGER:
|
||||
{
|
||||
@@ -8363,9 +8391,15 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
||||
|
||||
if (!P_MobjWasRemoved(mobj->tracer) && !(leveltime % 10))
|
||||
{
|
||||
mobj_t *dust = P_SpawnMobj(mobj->x + (P_RandomRange(-4, 4)<<FRACBITS),
|
||||
mobj->y + (P_RandomRange(-4, 4)<<FRACBITS),
|
||||
mobj->z + (P_RandomRange(0, 2)<<FRACBITS), MT_BBZDUST);
|
||||
fixed_t rand_x;
|
||||
fixed_t rand_y;
|
||||
fixed_t rand_z;
|
||||
|
||||
rand_z = mobj->z + (P_RandomRange(0, 2)<<FRACBITS);
|
||||
rand_y = mobj->y + (P_RandomRange(-4, 4)<<FRACBITS);
|
||||
rand_x = mobj->x + (P_RandomRange(-4, 4)<<FRACBITS);
|
||||
|
||||
mobj_t *dust = P_SpawnMobj(rand_x, rand_y, rand_z, MT_BBZDUST);
|
||||
P_SetScale(dust, mobj->scale/2);
|
||||
P_InstaThrust(dust, FixedAngle(P_RandomRange(0,359)<<FRACBITS), abs(mobj->tracer->momz)/2);
|
||||
|
||||
|
||||
Reference in new issue
Block a user