diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp index be13d6bbf..99e283554 100644 --- a/source/games/duke/src/gameexec.cpp +++ b/source/games/duke/src/gameexec.cpp @@ -296,8 +296,8 @@ void DoPlayer(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor, break; case PLAYER_EXITX: - if (bSet) ps[iPlayer].exitx = lValue; - else SetGameVarID(lVar2, ps[iPlayer].exitx, sActor, sPlayer); + if (bSet) ps[iPlayer].exit.X = lValue; + else SetGameVarID(lVar2, ps[iPlayer].exit.X, sActor, sPlayer); break; case PLAYER_EXITY: diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp index a693a5141..6647c1abc 100644 --- a/source/games/duke/src/player.cpp +++ b/source/games/duke/src/player.cpp @@ -1072,7 +1072,7 @@ DEFINE_FIELD_X(DukePlayer, player_struct, orandom_club_frame) DEFINE_FIELD_X(DukePlayer, player_struct, hard_landing) DEFINE_FIELD_X(DukePlayer, player_struct, ohard_landing) DEFINE_FIELD_X(DukePlayer, player_struct, psectlotag) -DEFINE_FIELD_X(DukePlayer, player_struct, exitx) +//DEFINE_FIELD_X(DukePlayer, player_struct, exitx) DEFINE_FIELD_X(DukePlayer, player_struct, exity) DEFINE_FIELD_X(DukePlayer, player_struct, loogiex) DEFINE_FIELD_X(DukePlayer, player_struct, loogiey) diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp index bde3de78f..3c16b4499 100644 --- a/source/games/duke/src/premap.cpp +++ b/source/games/duke/src/premap.cpp @@ -716,7 +716,7 @@ void prelevel_common(int g) if (sectp->lotag == -1) { - ps[0].exitx = sectp->firstWall()->pos.X; + ps[0].exit.X = sectp->firstWall()->pos.X; ps[0].exity = sectp->firstWall()->pos.Y; continue; } diff --git a/source/games/duke/src/premap_d.cpp b/source/games/duke/src/premap_d.cpp index 609e2bb51..d8cc51b99 100644 --- a/source/games/duke/src/premap_d.cpp +++ b/source/games/duke/src/premap_d.cpp @@ -289,7 +289,7 @@ void prelevel_d(int g, TArray& actors) if (ac->spr.lotag == -1 && (ac->spr.cstat & CSTAT_SPRITE_ALIGNMENT_WALL)) { - ps[0].exitx = ac->spr.pos.X; + ps[0].exit.X = ac->spr.pos.X; ps[0].exity = ac->spr.pos.Y; } else switch (ac->spr.picnum) diff --git a/source/games/duke/src/premap_r.cpp b/source/games/duke/src/premap_r.cpp index b8444af50..0ef79f677 100644 --- a/source/games/duke/src/premap_r.cpp +++ b/source/games/duke/src/premap_r.cpp @@ -533,7 +533,7 @@ void prelevel_r(int g, TArray& actors) if (ac->spr.lotag == -1 && (ac->spr.cstat & CSTAT_SPRITE_ALIGNMENT_WALL)) { - ps[0].exitx = ac->spr.pos.X; + ps[0].exit.X = ac->spr.pos.X; ps[0].exity = ac->spr.pos.Y; } else switch (ac->spr.picnum) diff --git a/source/games/duke/src/savegame.cpp b/source/games/duke/src/savegame.cpp index dfd34c092..1bf6c7a5f 100644 --- a/source/games/duke/src/savegame.cpp +++ b/source/games/duke/src/savegame.cpp @@ -116,7 +116,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, player_struct& w, ("pals", w.pals) ("fricx", w.fric.X) ("fricy", w.fric.Y) - ("exitx", w.exitx) + ("exitx", w.exit.X) ("exity", w.exity) ("numloogs", w.numloogs) ("loogcnt", w.loogcnt) diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h index 1a3639d2a..c20e9c301 100644 --- a/source/games/duke/src/types.h +++ b/source/games/duke/src/types.h @@ -187,7 +187,7 @@ struct player_struct PalEntry pals; // this was a global variable originally. - vec2_t fric; + vec2_t fric, exit; // weapon drawer variables and their interpolation counterparts. int weapon_sway; @@ -201,7 +201,7 @@ struct player_struct short psectlotag; // From here on it is unaltered from JFDuke with the exception of a few fields that are no longer needed and were removed. - int exitx, exity, loogiex[64], loogiey[64], numloogs, loogcnt; + int exity, loogiex[64], loogiey[64], numloogs, loogcnt; int invdisptime; int bobposx, bobposy, pyoff, opyoff; int last_pissed_time, truefz, truecz; diff --git a/wadsrc/static/zscript/games/duke/dukegame.zs b/wadsrc/static/zscript/games/duke/dukegame.zs index 0165a9179..70ee8bfae 100644 --- a/wadsrc/static/zscript/games/duke/dukegame.zs +++ b/wadsrc/static/zscript/games/duke/dukegame.zs @@ -150,7 +150,7 @@ struct DukePlayer native int16 psectlotag; // From here on it is unaltered from JFDuke with the exception of a few fields that are no longer needed and were removed. - native int exitx, exity, loogiex[64], loogiey[64], numloogs, loogcnt; + native int exity, loogiex[64], loogiey[64], numloogs, loogcnt; native int invdisptime; native int bobposx, bobposy, pyoff, opyoff; native int last_pissed_time, truefz, truecz;