teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-04 07:00:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- rename STD_RANDOM_RANGE

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-25 16:30:22 +01:00
parent d957540258
commit 297921204f
14 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/sw/src/bunny.cpp
View file

@ -1023,7 +1023,7 @@ int DoBunnyQuickJump(DSWActor* actor)
if (pp == Player+myconnectindex)
{
choose_snd = STD_RANDOM_RANGE(2<<8)>>8;
choose_snd = StdRandomRange(2<<8)>>8;
if (FAFcansee(actor->spr.pos.X,actor->spr.pos.Y,ActorZOfTop(actor),actor->spr.sector(),pp->pos.X, pp->pos.Y, pp->pos.Z, pp->cursector) && Facing(actor, u->targetActor))
PlayerSound(fagsnds[choose_snd], v3df_doppler|v3df_follow|v3df_dontpan,pp);
}
@ -1038,7 +1038,7 @@ int DoBunnyQuickJump(DSWActor* actor)
if (pp == Player+myconnectindex)
{
choose_snd = STD_RANDOM_RANGE(3<<8)>>8;
choose_snd = StdRandomRange(3<<8)>>8;
if (FAFcansee(actor->spr.pos.X,actor->spr.pos.Y,ActorZOfTop(actor),actor->spr.sector(),pp->pos.X, pp->pos.Y, pp->pos.Z, pp->cursector) && Facing(actor, u->targetActor))
PlayerSound(straightsnds[choose_snd], v3df_doppler|v3df_follow|v3df_dontpan,pp);
}

2
source/games/sw/src/draw.cpp
View file

@ -874,7 +874,7 @@ void analyzesprites(tspritetype* tsprite, int& spritesortcnt, int viewx, int vie
}
}
tsp->shade = 12 - STD_RANDOM_RANGE(30);
tsp->shade = 12 - StdRandomRange(30);
}
}
}

2
source/games/sw/src/game.cpp
View file

@ -585,7 +585,7 @@ static void PlayOrderSound()
if (!DidOrderSound)
{
DidOrderSound = true;
int choose_snd = STD_RANDOM_RANGE(1000);
int choose_snd = StdRandomRange(1000);
if (choose_snd > 500)
PlaySound(DIGI_WANGORDER1, v3df_dontpan, CHAN_BODY, CHANF_UI);
else

1
source/games/sw/src/game.h
View file

@ -196,7 +196,6 @@ inline int32_t FIXED(int32_t msw, int32_t lsw)
int StdRandomRange(int range);
#define STD_RANDOM_P2(pwr_of_2) (MOD_P2(rand(),(pwr_of_2)))
#define STD_RANDOM_RANGE(range) (StdRandomRange(range))
#define STD_RANDOM() (rand())
#define RANDOM_NEG(x,y) ((RANDOM_P2(((x)<<(y))<<1) - (x))<<(y))

2
source/games/sw/src/inv.cpp
View file

@ -262,7 +262,7 @@ void UseInventoryRepairKit(PLAYERp pp)
//PlaySound(DIGI_TOOLBOX, pp, v3df_none);
if (pp == Player + myconnectindex)
{
if (STD_RANDOM_RANGE(1000) > 500)
if (StdRandomRange(1000) > 500)
PlayerSound(DIGI_NOREPAIRMAN, v3df_follow|v3df_dontpan,pp);
else
PlayerSound(DIGI_NOREPAIRMAN2, v3df_follow|v3df_dontpan,pp);

4
source/games/sw/src/miscactr.cpp
View file

@ -1870,7 +1870,7 @@ int DoPruneGirl(DSWActor* actor)
if (!SoundValidAndActive(actor, CHAN_AnimeMad))
{
short choose;
choose = STD_RANDOM_RANGE(1000);
choose = StdRandomRange(1000);
if (choose > 750)
PlaySound(DIGI_LANI089, actor, v3df_dontpan, CHAN_AnimeMad);
@ -1890,7 +1890,7 @@ int DoPruneGirl(DSWActor* actor)
if (!SoundValidAndActive(actor, CHAN_CoyHandle))
{
short choose;
choose = STD_RANDOM_RANGE(1000);
choose = StdRandomRange(1000);
if (choose > 990)
PlaySound(DIGI_PRUNECACKLE, actor, v3df_dontpan, CHAN_CoyHandle);

8
source/games/sw/src/panel.cpp
View file

@ -193,7 +193,7 @@ void DoPlayerChooseYell(PLAYERp pp)
if (RandomRange(1000) < 990) return;
choose_snd = STD_RANDOM_RANGE(MAX_YELLSOUNDS);
choose_snd = StdRandomRange(MAX_YELLSOUNDS);
if (pp == Player+myconnectindex)
PlayerSound(PlayerYellVocs[choose_snd], v3df_follow|v3df_dontpan,pp);
@ -990,7 +990,7 @@ void InitWeaponSword(PLAYERp pp)
if (pp == Player+myconnectindex && PlayClock > 0)
{
rnd_num = STD_RANDOM_RANGE(1024);
rnd_num = StdRandomRange(1024);
if (rnd_num > 900)
PlaySound(DIGI_TAUNTAI2, pp, v3df_follow|v3df_dontpan);
else if (rnd_num > 800)
@ -1385,7 +1385,7 @@ void InitWeaponStar(PLAYERp pp)
pSetState(psp, psp->PresentState);
PlaySound(DIGI_PULL, pp, v3df_follow|v3df_dontpan);
if (STD_RANDOM_RANGE(1000) > 900 && pp == Player+myconnectindex)
if (StdRandomRange(1000) > 900 && pp == Player+myconnectindex)
{
if (!sw_darts)
PlayerSound(DIGI_ILIKESHURIKEN, v3df_follow|v3df_dontpan,pp);
@ -4176,7 +4176,7 @@ void pMicroRest(PANEL_SPRITEp psp)
if (pp == Player+myconnectindex)
{
choose_voc = STD_RANDOM_RANGE(1024);
choose_voc = StdRandomRange(1024);
if (choose_voc > 600)
PlayerSound(DIGI_TAUNTAI2,v3df_dontpan|v3df_follow,psp->PlayerP);
else if (choose_voc > 300)

4
source/games/sw/src/player.cpp
View file

@ -5332,7 +5332,7 @@ const char *SuicideNote[MAX_SUICIDE] =
char *KilledPlayerMessage(PLAYERp pp, PLAYERp killer)
{
const int MAX_KILL_NOTES = 16;
short rnd = STD_RANDOM_RANGE(MAX_KILL_NOTES);
short rnd = StdRandomRange(MAX_KILL_NOTES);
const char *p1 = pp->PlayerName;
const char *p2 = killer->PlayerName;
@ -5405,7 +5405,7 @@ void DoPlayerDeathMessage(PLAYERp pp, PLAYERp killer)
if (pp == killer && pp == Player + myconnectindex)
{
sprintf(ds,"%s %s",pp->PlayerName,SuicideNote[STD_RANDOM_RANGE(MAX_SUICIDE)]);
sprintf(ds,"%s %s",pp->PlayerName,SuicideNote[StdRandomRange(MAX_SUICIDE)]);
SEND_OK = true;
}
else

10
source/games/sw/src/quake.cpp
View file

@ -134,7 +134,7 @@ void ProcessQuakeSpot(void)
// spawn a quake if condition is met
rand_test = QUAKE_RandomTest(actor);
// wrong - all quakes need to happen at the same time on all computerssg
//if (!rand_test || (rand_test && STD_RANDOM_RANGE(128) < rand_test))
//if (!rand_test || (rand_test && StdRandomRange(128) < rand_test))
if (!rand_test || (rand_test && RandomRange(128) < rand_test))
{
CopyQuakeSpotToOn(actor);
@ -199,14 +199,14 @@ void QuakeViewChange(PLAYERp pp, int *z_diff, int *x_diff, int *y_diff, short *a
if (save_dist > radius)
return;
*z_diff = Z(STD_RANDOM_RANGE(QUAKE_Zamt(actor)) - (QUAKE_Zamt(actor)/2));
*z_diff = Z(StdRandomRange(QUAKE_Zamt(actor)) - (QUAKE_Zamt(actor)/2));
ang_amt = QUAKE_AngAmt(actor) * 4L;
*ang_diff = STD_RANDOM_RANGE(ang_amt) - (ang_amt/2);
*ang_diff = StdRandomRange(ang_amt) - (ang_amt/2);
pos_amt = QUAKE_PosAmt(actor) * 4L;
*x_diff = STD_RANDOM_RANGE(pos_amt) - (pos_amt/2);
*y_diff = STD_RANDOM_RANGE(pos_amt) - (pos_amt/2);
*x_diff = StdRandomRange(pos_amt) - (pos_amt/2);
*y_diff = StdRandomRange(pos_amt) - (pos_amt/2);
if (!QUAKE_TestDontTaper(actor))
{

4
source/games/sw/src/sector.cpp
View file

@ -1416,7 +1416,7 @@ int OperateSprite(DSWActor* actor, short player_is_operating)
if (pp != Player+myconnectindex) return true;
choose_snd = STD_RANDOM_RANGE(1000);
choose_snd = StdRandomRange(1000);
if (actor->spr.lotag == CARGIRL_R0)
{
if (choose_snd > 700)
@ -2015,7 +2015,7 @@ bool NearThings(PLAYERp pp)
// Near a plain old vanilla wall. Can't do anything but grunt.
if (!TEST(hit.hitWall->extra, WALLFX_DONT_STICK) && pp == Player+myconnectindex)
{
if (STD_RANDOM_RANGE(1000) > 970)
if (StdRandomRange(1000) > 970)
PlayerSound(DIGI_HITTINGWALLS, v3df_follow|v3df_dontpan,pp);
else
PlayerSound(DIGI_SEARCHWALL, v3df_follow|v3df_dontpan,pp);

8
source/games/sw/src/sounds.cpp
View file

@ -307,7 +307,7 @@ static void RestartAmbient(AmbientSound* amb)
auto rolloff = GetRolloff(vp.voc_distance);
int pitch = 0;
if (vp.pitch_hi <= vp.pitch_lo) pitch = vp.pitch_lo;
else pitch = vp.pitch_lo + (STD_RANDOM_RANGE(vp.pitch_hi - vp.pitch_lo));
else pitch = vp.pitch_lo + (StdRandomRange(vp.pitch_hi - vp.pitch_lo));
amb->curIndex = PlayClock;
if (!soundEngine->IsSourcePlayingSomething(SOURCE_Ambient, amb, CHAN_BODY, amb->vocIndex))
@ -332,7 +332,7 @@ static int RandomizeAmbientSpecials(int handle)
for (i = 0; i < MAXRNDAMB; i++)
{
if (handle == ambrand[i])
return ambrand[STD_RANDOM_RANGE(MAXRNDAMB - 1)];
return ambrand[StdRandomRange(MAXRNDAMB - 1)];
}
return -1;
@ -356,7 +356,7 @@ static void DoTimedSound(AmbientSound* amb)
if (ambid != -1)
{
amb->vocIndex = ambarray[ambid].diginame;
amb->maxIndex = STD_RANDOM_RANGE(ambarray[ambid].maxtics);
amb->maxIndex = StdRandomRange(ambarray[ambid].maxtics);
}
RestartAmbient(amb);
}
@ -676,7 +676,7 @@ int _PlaySound(int num, DSWActor* actor, PLAYERp pp, vec3_t* pos, Voc3D_Flags fl
int pitch = 0;
if (vp->pitch_hi <= vp->pitch_lo) pitch = vp->pitch_lo;
else if (vp->pitch_hi != vp->pitch_lo) pitch = vp->pitch_lo + (STD_RANDOM_RANGE(vp->pitch_hi - vp->pitch_lo));
else if (vp->pitch_hi != vp->pitch_lo) pitch = vp->pitch_lo + (StdRandomRange(vp->pitch_hi - vp->pitch_lo));
auto rolloff = GetRolloff(vp->voc_distance);
FVector3 spos = pos ? GetSoundPos(pos) : FVector3(0, 0, 0);

14
source/games/sw/src/sprite.cpp
View file

@ -5011,7 +5011,7 @@ void ChoosePlayerGetSound(PLAYERp pp)
if (pp != Player+myconnectindex) return;
choose_snd = STD_RANDOM_RANGE((MAX_GETSOUNDS-1)<<8)>>8;
choose_snd = StdRandomRange((MAX_GETSOUNDS-1)<<8)>>8;
PlayerSound(PlayerGetItemVocs[choose_snd], v3df_follow|v3df_dontpan,pp);
}
@ -5266,7 +5266,7 @@ KeyMain:
// Say something witty
if (pp == Player+myconnectindex)
{
int cookie = STD_RANDOM_RANGE(MAX_FORTUNES);
int cookie = StdRandomRange(MAX_FORTUNES);
// print to the console, and the user quote display.
FStringf msg("%s %s", GStrings("TXTS_FORTUNE"), quoteMgr.GetQuote(QUOTE_COOKIE + cookie));
Printf(PRINT_NONOTIFY, TEXTCOLOR_SAPPHIRE "%s\n", msg.GetChars());
@ -5588,7 +5588,7 @@ KeyMain:
SetFadeAmt(pp,ITEMFLASHAMT,ITEMFLASHCLR); // Flash blue on item pickup
if (pp == Player+myconnectindex)
PlaySound(DIGI_ITEM, actor, v3df_dontpan);
if (STD_RANDOM_RANGE(1000) > 800 && pp == Player+myconnectindex)
if (StdRandomRange(1000) > 800 && pp == Player+myconnectindex)
PlayerSound(DIGI_ILIKENUKES, v3df_dontpan|v3df_doppler|v3df_follow,pp);
if (pp->CurWpn == pp->Wpn[WPN_MICRO])
{
@ -5622,7 +5622,7 @@ KeyMain:
if (pp == Player+myconnectindex)
PlaySound(DIGI_ITEM, actor, v3df_dontpan);
//ChoosePlayerGetSound(pp);
if (STD_RANDOM_RANGE(1000) > 800 && pp == Player+myconnectindex)
if (StdRandomRange(1000) > 800 && pp == Player+myconnectindex)
PlayerSound(DIGI_LIKEBIGWEAPONS, v3df_dontpan|v3df_doppler|v3df_follow,pp);
KillGetWeapon(actor);
if (TEST(pp->WpnFlags, BIT(WPN_GRENADE)))
@ -5692,7 +5692,7 @@ KeyMain:
PlaySound(DIGI_ITEM, actor, v3df_dontpan);
if (pp == Player+myconnectindex)
{
if (STD_RANDOM_RANGE(1000) > 700)
if (StdRandomRange(1000) > 700)
PlayerSound(DIGI_LIKEBIGWEAPONS, v3df_dontpan|v3df_doppler|v3df_follow,pp);
else
PlayerSound(DIGI_GOTRAILGUN, v3df_dontpan|v3df_doppler|v3df_follow,pp);
@ -5806,7 +5806,7 @@ KeyMain:
if (pp == Player+myconnectindex)
PlaySound(DIGI_ITEM, actor, v3df_dontpan);
//ChoosePlayerGetSound(pp);
if (STD_RANDOM_RANGE(1000) > 800 && pp == Player+myconnectindex)
if (StdRandomRange(1000) > 800 && pp == Player+myconnectindex)
PlayerSound(DIGI_LIKEBIGWEAPONS, v3df_dontpan|v3df_doppler|v3df_follow,pp);
KillGetWeapon(actor);
if (TEST(pp->WpnFlags, BIT(WPN_HOTHEAD)))
@ -5851,7 +5851,7 @@ KeyMain:
if (pp == Player+myconnectindex)
PlaySound(DIGI_ITEM, actor, v3df_dontpan);
//ChoosePlayerGetSound(pp);
if (STD_RANDOM_RANGE(1000) > 800 && pp == Player+myconnectindex)
if (StdRandomRange(1000) > 800 && pp == Player+myconnectindex)
PlayerSound(DIGI_LIKEBIGWEAPONS, v3df_dontpan|v3df_doppler|v3df_follow,pp);
KillGetWeapon(actor);
if (TEST(pp->WpnFlags, BIT(WPN_HEART)))

12
source/games/sw/src/weapon.cpp
View file

@ -4876,9 +4876,9 @@ int ActorChooseDeath(DSWActor* actor, DSWActor* weapActor)
{
PLAYERp pp = wu->PlayerP;
if (wu->WeaponNum == WPN_FIST && STD_RANDOM_RANGE(1000)>500 && pp == Player+myconnectindex)
if (wu->WeaponNum == WPN_FIST && StdRandomRange(1000)>500 && pp == Player+myconnectindex)
{
int choosesnd = STD_RANDOM_RANGE(6);
int choosesnd = StdRandomRange(6);
if (choosesnd == 0)
PlayerSound(DIGI_KUNGFU, v3df_follow|v3df_dontpan,pp);
@ -4895,11 +4895,11 @@ int ActorChooseDeath(DSWActor* actor, DSWActor* weapActor)
//PlayerSound(TauntAIVocs[choosesnd],&pp->posx,
// &pp->posy,&pp->posy,v3df_dontpan|v3df_follow,pp);
}
else if (wu->WeaponNum == WPN_SWORD && STD_RANDOM_RANGE(1000)>500 && pp == Player+myconnectindex)
else if (wu->WeaponNum == WPN_SWORD && StdRandomRange(1000)>500 && pp == Player+myconnectindex)
{
short choose_snd;
choose_snd = STD_RANDOM_RANGE(1000);
choose_snd = StdRandomRange(1000);
if (choose_snd > 750)
PlayerSound(DIGI_SWORDGOTU1, v3df_follow|v3df_dontpan,pp);
else if (choose_snd > 575)
@ -4981,7 +4981,7 @@ int ActorChooseDeath(DSWActor* actor, DSWActor* weapActor)
pp = own->user.PlayerP;
if (pp)
{
choosesnd=STD_RANDOM_RANGE(MAX_TAUNTAI<<8)>>8;
choosesnd=StdRandomRange(MAX_TAUNTAI<<8)>>8;
if (pp == Player+myconnectindex)
PlayerSound(TauntAIVocs[choosesnd],v3df_dontpan|v3df_follow,pp);
@ -5628,7 +5628,7 @@ int DoDamage(DSWActor* actor, DSWActor* weapActor)
{
int choosesnd=0;
// Random chance of taunting the AI's here
if (STD_RANDOM_RANGE(1024) > 512 && pp == Player+myconnectindex)
if (StdRandomRange(1024) > 512 && pp == Player+myconnectindex)
{
choosesnd=RandomRange(MAX_TAUNTAI);
PlayerSound(TauntAIVocs[choosesnd],v3df_dontpan|v3df_follow,pp);

2
source/games/sw/src/zilla.cpp
View file

@ -706,7 +706,7 @@ int DoZillaMove(DSWActor* actor)
// Random Zilla taunts
if (!SoundValidAndActive(actor, CHAN_AnimeMad))
{
choose = STD_RANDOM_RANGE(1000);
choose = StdRandomRange(1000);
if (choose > 990)
PlaySound(DIGI_Z16004, actor, v3df_none, CHAN_AnimeMad);
else if (choose > 985)