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

- Duke: Clean up player/actor accesses in endoflevel().

Browse source
This commit is contained in:
Mitchell Richters 2023-10-03 22:37:00 +11:00 committed by Christoph Oelckers
parent 55c150845c
commit c7c63413ce
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/funct.h
View file

@ -99,7 +99,7 @@ int wakeup(DDukeActor* sn, DDukePlayer* const p);
int timedexit(int snum);
void dokneeattack(DDukePlayer* const p);
int endoflevel(int snum);
int endoflevel(DDukePlayer* const p);
void playerisdead(DDukePlayer* const p, int psectlotag, double fz, double cz);
void footprints(DDukePlayer* const p);
int makepainsounds(DDukePlayer* const p, int type);

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

@ -620,10 +620,8 @@ void playerisdead(DDukePlayer* const p, int psectlotag, double floorz, double ce
//
//---------------------------------------------------------------------------
int endoflevel(int snum)
int endoflevel(DDukePlayer* const p)
{
auto p = getPlayer(snum);
// the fist puching the end-of-level thing...
p->ofist_incs = p->fist_incs;
p->fist_incs++;

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

@ -1626,7 +1626,7 @@ void processinput_d(int snum)
if (p->fist_incs)
{
if (endoflevel(snum)) return;
if (endoflevel(p)) return;
}
if (p->timebeforeexit > 1 && p->last_extra > 0)

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

@ -2438,7 +2438,7 @@ void processinput_r(int snum)
if (p->fist_incs)
{
if (endoflevel(snum)) return;
if (endoflevel(p)) return;
}
if (p->timebeforeexit > 1 && p->last_extra > 0)