teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-20 08:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Consolidate random range applied to weapon vel.Z into an inline.

Browse source
This commit is contained in:
Mitchell Richters 2022-09-27 10:49:09 +10:00 committed by Christoph Oelckers
parent fcdb360b92
commit f6f88f587d
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/games/sw/src/jweapon.cpp
View file

@ -1317,6 +1317,17 @@ int PlayerInitChemBomb(PLAYER* pp)
//
//---------------------------------------------------------------------------
static inline double RandomZVel()
{
return (-100 - RandomRange(100)) * 0.5;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int InitSpriteChemBomb(DSWActor* actor)
{
PlaySound(DIGI_THROW, actor, v3df_dontpan | v3df_doppler);
@ -1340,7 +1351,7 @@ int InitSpriteChemBomb(DSWActor* actor)
actorNew->spr.cstat |= (CSTAT_SPRITE_YCENTER);
actorNew->spr.cstat |= (CSTAT_SPRITE_BLOCK);
actorNew->vel.Z = (-100 - RandomRange(100)) * HORIZ_MULTF;
actorNew->vel.Z = RandomZVel();
actorNew->set_const_clipdist(80 >> 2);
@ -1381,7 +1392,7 @@ int InitChemBomb(DSWActor* actor)
if (SpriteInUnderwaterArea(actorNew))
actorNew->user.Flags |= (SPR_UNDERWATER);
actorNew->vel.Z = (-100 - RandomRange(100)) * HORIZ_MULTF;
actorNew->vel.Z = RandomZVel();
actorNew->set_const_clipdist(0);
if (actor->user.ID == MUSHROOM_CLOUD || actor->user.ID == 3121 || actor->user.ID == SUMO_RUN_R0) // 3121 == GRENADE_EXP
@ -1701,7 +1712,7 @@ int InitCaltrops(DSWActor* actor)
actorNew->user.ceiling_dist = 3;
actorNew->user.floor_dist = 3;
actorNew->user.Counter = 0;
actorNew->vel.Z = (-100 - RandomRange(100)) * HORIZ_MULTF;
actorNew->vel.Z = RandomZVel();
UpdateChange(actorNew, 0.5);
@ -1744,7 +1755,7 @@ int InitPhosphorus(DSWActor* actor)
actorNew->user.ceiling_dist = 3;
actorNew->user.floor_dist = 3;
actorNew->user.Counter = 0;
actorNew->vel.Z = (-100 - RandomRange(100)) * HORIZ_MULTF;
actorNew->vel.Z = RandomZVel();
UpdateChange(actorNew, 0.5);