diff --git a/source/core/maptypes.h b/source/core/maptypes.h index 276159bae..4fbdf76fc 100644 --- a/source/core/maptypes.h +++ b/source/core/maptypes.h @@ -383,7 +383,7 @@ struct spritetypebase // todo: get rid of the single variables! vec3_t pos; union { - struct { int32_t BLAHBLAHX, oy, oz; }; + struct { int32_t BLAHBLAHX, BLAHBLAHY, oz; }; vec3_t opos; }; @@ -428,7 +428,7 @@ struct spritetypebase int32_t interpolatedy(double const smoothratio, int const scale = 16) { - return interpolatedvalue(oy, pos.Y, smoothratio, scale); + return interpolatedvalue(BLAHBLAHY, pos.Y, smoothratio, scale); } int32_t interpolatedz(double const smoothratio, int const scale = 16) diff --git a/source/games/blood/src/_polymost.cpp b/source/games/blood/src/_polymost.cpp index 1ad27d444..adcdce584 100644 --- a/source/games/blood/src/_polymost.cpp +++ b/source/games/blood/src/_polymost.cpp @@ -52,7 +52,7 @@ void collectTSpritesForPortal(int x, int y, int i, int interpolation) pTSprite->ownerActor = actor; pTSprite->flags = pSprite->hitag | 0x200; pTSprite->pos.X = dx + interpolatedvalue(pSprite->opos.X, pSprite->pos.X, interpolation); - pTSprite->pos.Y = dy + interpolatedvalue(pSprite->oy, pSprite->pos.Y, interpolation); + pTSprite->pos.Y = dy + interpolatedvalue(pSprite->opos.Y, pSprite->pos.Y, interpolation); pTSprite->pos.Z = dz + interpolatedvalue(pSprite->oz, pSprite->pos.Z, interpolation); pTSprite->ang = pSprite->interpolatedang(interpolation); diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index 9f458e4da..5b211e89a 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -3727,7 +3727,7 @@ void move_d(DDukeActor *actor, int playernum, int xvel) if (t[1] == 0 || a == 0) { - if ((badguy(actor) && actor->spr.extra <= 0) || (actor->spr.opos.X != actor->spr.pos.X) || (actor->spr.oy != actor->spr.pos.Y)) + if ((badguy(actor) && actor->spr.extra <= 0) || (actor->spr.opos.X != actor->spr.pos.X) || (actor->spr.opos.Y != actor->spr.pos.Y)) { actor->spr.backupvec2(); SetActor(actor, actor->spr.pos); diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp index cc9f7c48a..283d175ef 100644 --- a/source/games/duke/src/actors_r.cpp +++ b/source/games/duke/src/actors_r.cpp @@ -3763,7 +3763,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel) if (t[1] == 0 || a == 0) { - if ((badguy(actor) && actor->spr.extra <= 0) || (actor->spr.opos.X != actor->spr.pos.X) || (actor->spr.oy != actor->spr.pos.Y)) + if ((badguy(actor) && actor->spr.extra <= 0) || (actor->spr.opos.X != actor->spr.pos.X) || (actor->spr.opos.Y != actor->spr.pos.Y)) { actor->spr.backupvec2(); SetActor(actor, actor->spr.pos); diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp index d820ac17e..9ce30d7bc 100644 --- a/source/games/duke/src/gameexec.cpp +++ b/source/games/duke/src/gameexec.cpp @@ -1333,8 +1333,8 @@ void DoActor(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor, else SetGameVarID(lVar2, act->spr.opos.X, sActor, sPlayer); break; case ACTOR_HTBPOSY: - if (bSet) act->spr.oy = lValue; - else SetGameVarID(lVar2, act->spr.oy, sActor, sPlayer); + if (bSet) act->spr.opos.Y = lValue; + else SetGameVarID(lVar2, act->spr.opos.Y, sActor, sPlayer); break; case ACTOR_HTBPOSZ: if (bSet) act->spr.oz = lValue; diff --git a/source/games/exhumed/src/osdcmds.cpp b/source/games/exhumed/src/osdcmds.cpp index a685eb517..2d7a3f3b3 100644 --- a/source/games/exhumed/src/osdcmds.cpp +++ b/source/games/exhumed/src/osdcmds.cpp @@ -39,7 +39,7 @@ void GameInterface::WarpToCoords(int x, int y, int z, int ang, int horz) spritetype *pSprite = &nPlayer->Actor()->s(); pSprite->opos.X = pSprite->pos.X = x; - pSprite->oy = pSprite->pos.Y = y; + pSprite->opos.Y = pSprite->pos.Y = y; pSprite->oz = pSprite->pos.Z = z; if (ang != INT_MIN)