zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

reduce dependency of code on global gameclock variable

Browse source 
passing it as parameter to operateweapon*
This commit is contained in:
Christoph Oelckers 2020-08-31 00:17:40 +02:00
parent 007c6e122d
commit 34104a74d8
3 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
source/games/duke/src/player_d.cpp
View file

@ -41,7 +41,7 @@ source as it is released.
BEGIN_DUKE_NS
void fireweapon_ww(int snum);
void operateweapon_ww(int snum, ESyncBits actions, int psect);
void operateweapon_ww(int snum, ESyncBits actions, int psect, int ticker);
//---------------------------------------------------------------------------
//
@ -2077,7 +2077,7 @@ static void fireweapon(int snum)
//
//---------------------------------------------------------------------------
static void operateweapon(int snum, ESyncBits actions, int psect)
static void operateweapon(int snum, ESyncBits actions, int psect, int ticker)
{
auto p = &ps[snum];
int pi = p->i;
@ -2181,7 +2181,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
{
fi.shoot(pi, SHOTSPARK1);
S_PlayActorSound(PISTOL_FIRE, pi);
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
p->visibility = 0;
}
@ -2240,7 +2240,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
S_PlayActorSound(SHOTGUN_FIRE, pi);
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
p->visibility = 0;
}
@ -2293,7 +2293,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
S_PlayActorSound(CHAINGUN_FIRE, pi);
fi.shoot(pi, CHAINGUN);
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
p->visibility = 0;
checkavailweapon(p);
@ -2344,7 +2344,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
{
// make them visible if not set...
p->visibility = 0;
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
}
checkavailweapon(p);
//#endif
@ -2358,7 +2358,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
{
// make them visible if not set...
p->visibility = 0;
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
}
checkavailweapon(p);
}
@ -2377,7 +2377,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
{
p->visibility = 0;
//flashColor = 176 + (252 << 8) + (120 << 16);
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
checkavailweapon(p);
}
}
@ -2403,7 +2403,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
(p->kickback_pic & 1))
{
p->visibility = 0;
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
fi.shoot(pi, RPG);
p->ammo_amount[DEVISTATOR_WEAPON]--;
checkavailweapon(p);
@ -2413,7 +2413,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
else if (p->kickback_pic & 1)
{
p->visibility = 0;
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
fi.shoot(pi, RPG);
p->ammo_amount[DEVISTATOR_WEAPON]--;
checkavailweapon(p);
@ -2433,7 +2433,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
p->ammo_amount[p->curr_weapon]--;
p->visibility = 0;
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
fi.shoot(pi, FREEZEBLAST);
checkavailweapon(p);
}
@ -2516,7 +2516,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
if (p->kickback_pic == 4)
{
p->ammo_amount[RPG_WEAPON]--;
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
p->visibility = 0;
fi.shoot(pi, RPG);
checkavailweapon(p);
@ -2625,8 +2625,8 @@ static void processweapon(int snum, ESyncBits actions, int psect)
}
else if (p->kickback_pic)
{
if (!isWW2GI()) operateweapon(snum, actions, psect);
else operateweapon_ww(snum, actions, psect);
if (!isWW2GI()) operateweapon(snum, actions, psect, gameclock);
else operateweapon_ww(snum, actions, psect, gameclock);
}
}
//---------------------------------------------------------------------------

20
source/games/duke/src/player_r.cpp
View file

@ -2771,7 +2771,7 @@ static void fireweapon(int snum)
//
//---------------------------------------------------------------------------
static void operateweapon(int snum, ESyncBits actions, int psect)
static void operateweapon(int snum, ESyncBits actions, int psect, int ticker)
{
auto p = &ps[snum];
int pi = p->i;
@ -2882,7 +2882,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
p->noise_radius = 8192;
madenoise(snum);
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
p->visibility = 0;
if (psectlotag != 857)
{
@ -2961,7 +2961,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
p->noise_radius = 8192;
madenoise(snum);
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
p->visibility = 0;
}
@ -3072,7 +3072,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
fi.shoot(pi, CHAINGUN);
p->noise_radius = 8192;
madenoise(snum);
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
p->visibility = 0;
if (psectlotag != 857)
@ -3128,7 +3128,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
if (p->kickback_pic == 2 || p->kickback_pic == 4)
{
p->visibility = 0;
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
S_PlayActorSound(CHAINGUN_FIRE, pi);
fi.shoot(pi, SHOTSPARK1);
p->noise_radius = 16384;
@ -3155,7 +3155,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
if (p->kickback_pic == 2 || p->kickback_pic == 4)
{
p->visibility = 0;
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
S_PlayActorSound(CHAINGUN_FIRE, pi);
fi.shoot(pi, CHAINGUN);
p->noise_radius = 16384;
@ -3213,7 +3213,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
{
p->ammo_amount[ALIENBLASTER_WEAPON]--;
p->visibility = 0;
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
checkavailweapon(p);
}
else if (p->kickback_pic == 12)
@ -3322,7 +3322,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
p->ammo_amount[CROSSBOW_WEAPON]--;
if (p->ammo_amount[DYNAMITE_WEAPON])
p->ammo_amount[DYNAMITE_WEAPON]--;
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
p->visibility = 0;
fi.shoot(pi, RPG);
p->noise_radius = 32768;
@ -3340,7 +3340,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
if (p->kickback_pic == 4)
{
p->ammo_amount[CHICKEN_WEAPON]--;
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
p->visibility = 0;
fi.shoot(pi, RPG2);
p->noise_radius = 32768;
@ -3414,7 +3414,7 @@ static void processweapon(int snum, ESyncBits actions, int psect)
}
else if (p->kickback_pic)
{
operateweapon(snum, actions, psect);
operateweapon(snum, actions, psect, gameclock);
}
}

4
source/games/duke/src/player_w.cpp
View file

@ -306,7 +306,7 @@ void fireweapon_ww(int snum)
//
//---------------------------------------------------------------------------
void operateweapon_ww(int snum, ESyncBits actions, int psect)
void operateweapon_ww(int snum, ESyncBits actions, int psect, int ticker)
{
auto p = &ps[snum];
int pi = p->i;
@ -400,7 +400,7 @@ void operateweapon_ww(int snum, ESyncBits actions, int psect)
if (!(aplWeaponFlags[p->curr_weapon][snum] & WEAPON_FLAG_NOVISIBLE))
{
// make them visible if not set...
lastvisinc = gameclock + 32;
lastvisinc = ticker + 32;
p->visibility = 0;
}
SetGameVarID(g_iWeaponVarID, p->curr_weapon, p->i, snum);