zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- store class pointers in weaprecs.

Browse source
This commit is contained in:
Christoph Oelckers 2022-12-30 19:25:02 +01:00
parent 2f78a10ce1
commit 5d43975467
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/games/duke/src/gameexec.cpp
View file

@ -686,16 +686,6 @@ void DoPlayer(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor,
else SetGameVarID(lVar2, ps[iPlayer].customexitsound, sActor, sPlayer);
break;
case PLAYER_WEAPRECS:
if (bSet) ps[iPlayer].weaprecs[lParm2] = lValue;
else SetGameVarID(lVar2, ps[iPlayer].weaprecs[lParm2], sActor, sPlayer);
break;
case PLAYER_WEAPRECCNT:
if (bSet) ps[iPlayer].weapreccnt = lValue;
else SetGameVarID(lVar2, ps[iPlayer].weapreccnt, sActor, sPlayer);
break;
case PLAYER_INTERFACE_TOGGLE_FLAG:
if (bSet) ps[iPlayer].interface_toggle_flag = lValue;
else SetGameVarID(lVar2, ps[iPlayer].interface_toggle_flag, sActor, sPlayer);
@ -1325,7 +1315,7 @@ int CheckWeapRec(player_struct* p, DDukeActor* g_ac, int testonly)
{
int j;
for (j = 0; j < p->weapreccnt; j++)
if (p->weaprecs[j] == g_ac->spr.picnum)
if (p->weaprecs[j] == g_ac->GetClass())
break;
if (testonly)
@ -1334,7 +1324,7 @@ int CheckWeapRec(player_struct* p, DDukeActor* g_ac, int testonly)
}
else if (p->weapreccnt < 32)
{
p->weaprecs[p->weapreccnt++] = g_ac->spr.picnum;
p->weaprecs[p->weapreccnt++] = g_ac->GetClass();
return (g_ac->GetOwner() == g_ac);
}
return false;

3
source/games/duke/src/types.h
View file

@ -278,7 +278,8 @@ struct player_struct
short extra_extra8, quick_kick, last_quick_kick;
short heat_amount, timebeforeexit, customexitsound;
short weaprecs[32], weapreccnt;
PClass* weaprecs[32];
int weapreccnt;
unsigned int interface_toggle_flag;
short dead_flag, show_empty_weapon;