diff --git a/source/games/duke/src/funct.h b/source/games/duke/src/funct.h index 7137acbd5..d04f90098 100644 --- a/source/games/duke/src/funct.h +++ b/source/games/duke/src/funct.h @@ -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); diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp index da85aa9f7..4d1b380f7 100644 --- a/source/games/duke/src/player.cpp +++ b/source/games/duke/src/player.cpp @@ -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++; diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index 1a51c6fec..331d57fb7 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -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) diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp index aef767379..bcc8e79f5 100644 --- a/source/games/duke/src/player_r.cpp +++ b/source/games/duke/src/player_r.cpp @@ -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)