diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index 9e5e413fb..1f8b2d6ef 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -1528,7 +1528,7 @@ static bool weaponhitsprite(DDukeActor* proj, DDukeActor *targ, bool fireball) for (int x = 0; x < j; x++) { ps[p].loogie[x].X = krand() % 320; - ps[p].loogiey[x] = krand() % 200; + ps[p].loogie[x].Y = krand() % 200; } } } diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp index 47718ad59..4253d4d70 100644 --- a/source/games/duke/src/actors_r.cpp +++ b/source/games/duke/src/actors_r.cpp @@ -1173,7 +1173,7 @@ static bool weaponhitsprite(DDukeActor *proj, DDukeActor *targ, const vec3_t &ol for (int x = 0; x < j; x++) { ps[p].loogie[x].X = krand() % 320; - ps[p].loogiey[x] = krand() % 200; + ps[p].loogie[x].Y = krand() % 200; } } } diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp index 3ba1f0f1c..3351e8fa7 100644 --- a/source/games/duke/src/gameexec.cpp +++ b/source/games/duke/src/gameexec.cpp @@ -311,8 +311,8 @@ void DoPlayer(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor, break; case PLAYER_LOOGIEY: - if (bSet) ps[iPlayer].loogiey[lParm2] = lValue; - else SetGameVarID(lVar2, ps[iPlayer].loogiey[lParm2], sActor, sPlayer); + if (bSet) ps[iPlayer].loogie[lParm2].Y = lValue; + else SetGameVarID(lVar2, ps[iPlayer].loogie[lParm2].Y, sActor, sPlayer); break; case PLAYER_NUMLOOGS: diff --git a/source/games/duke/src/hudweapon_d.cpp b/source/games/duke/src/hudweapon_d.cpp index a727f8fd8..94c2f8215 100644 --- a/source/games/duke/src/hudweapon_d.cpp +++ b/source/games/duke/src/hudweapon_d.cpp @@ -76,7 +76,7 @@ void displayloogie(player_struct* p) z = 4096 + ((p->loogcnt + i) << 9); x = -getavel(p->GetPlayerNum()) + bsinf((p->loogcnt + i) << 6, -10); - hud_drawsprite((p->loogie[i].X + x), (200 + p->loogiey[i] - y), z - (i << 8), 256 - a, LOOGIE, 0, 0, 2); + hud_drawsprite((p->loogie[i].X + x), (200 + p->loogie[i].Y - y), z - (i << 8), 256 - a, LOOGIE, 0, 0, 2); } } diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp index 735c997c7..9f200ca9d 100644 --- a/source/games/duke/src/player.cpp +++ b/source/games/duke/src/player.cpp @@ -1075,7 +1075,7 @@ DEFINE_FIELD_X(DukePlayer, player_struct, psectlotag) //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) +//DEFINE_FIELD_X(DukePlayer, player_struct, loogiey) DEFINE_FIELD_X(DukePlayer, player_struct, numloogs) DEFINE_FIELD_X(DukePlayer, player_struct, loogcnt) DEFINE_FIELD_X(DukePlayer, player_struct, invdisptime) diff --git a/source/games/duke/src/savegame.cpp b/source/games/duke/src/savegame.cpp index 7c8f44f17..10575403b 100644 --- a/source/games/duke/src/savegame.cpp +++ b/source/games/duke/src/savegame.cpp @@ -121,7 +121,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, player_struct& w, ("numloogs", w.numloogs) ("loogcnt", w.loogcnt) .Array("loogie", w.loogie, w.numloogs) - .Array("loogiey", w.loogiey, w.numloogs) ("bobposx", w.bobposx) ("bobposy", w.bobposy) ("pyoff", w.pyoff) diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h index 0479a4108..6b377c414 100644 --- a/source/games/duke/src/types.h +++ b/source/games/duke/src/types.h @@ -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 loogiey[64], numloogs, loogcnt; + int 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 0d43f185c..3a23c21a7 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 loogiey[64], numloogs, loogcnt; + native int numloogs, loogcnt; native int invdisptime; native int bobposx, bobposy, pyoff, opyoff; native int last_pissed_time, truefz, truecz;