teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-20 18:52:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Replace spritetypebase ox with opos.X calls.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-22 22:31:46 +11:00 committed by Christoph Oelckers
parent baf78848eb
commit e0fb92bb01
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/core/maptypes.h
View file

@ -383,7 +383,7 @@ struct spritetypebase
// todo: get rid of the single variables!
vec3_t pos;
union {
struct { int32_t ox, oy, oz; };
struct { int32_t BLAHBLAHX, oy, oz; };
vec3_t opos;
};
@ -423,7 +423,7 @@ struct spritetypebase
int32_t interpolatedx(double const smoothratio, int const scale = 16)
{
return interpolatedvalue(ox, pos.X, smoothratio, scale);
return interpolatedvalue(BLAHBLAHX, pos.X, smoothratio, scale);
}
int32_t interpolatedy(double const smoothratio, int const scale = 16)

2
source/games/blood/src/_polymost.cpp
View file

@ -51,7 +51,7 @@ void collectTSpritesForPortal(int x, int y, int i, int interpolation)
pTSprite->statnum = kStatDecoration;
pTSprite->ownerActor = actor;
pTSprite->flags = pSprite->hitag | 0x200;
pTSprite->pos.X = dx + interpolatedvalue(pSprite->ox, pSprite->pos.X, interpolation);
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.Z = dz + interpolatedvalue(pSprite->oz, pSprite->pos.Z, interpolation);
pTSprite->ang = pSprite->interpolatedang(interpolation);

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

@ -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.ox != 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.oy != actor->spr.pos.Y))
{
actor->spr.backupvec2();
SetActor(actor, actor->spr.pos);

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

@ -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.ox != 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.oy != actor->spr.pos.Y))
{
actor->spr.backupvec2();
SetActor(actor, actor->spr.pos);

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

@ -1329,8 +1329,8 @@ void DoActor(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor,
else SetGameVarID(lVar2, act->lastvy, sActor, sPlayer);
break;
case ACTOR_HTBPOSX:
if (bSet) act->spr.ox = lValue;
else SetGameVarID(lVar2, act->spr.ox, sActor, sPlayer);
if (bSet) act->spr.opos.X = lValue;
else SetGameVarID(lVar2, act->spr.opos.X, sActor, sPlayer);
break;
case ACTOR_HTBPOSY:
if (bSet) act->spr.oy = lValue;

2
source/games/exhumed/src/osdcmds.cpp
View file

@ -38,7 +38,7 @@ void GameInterface::WarpToCoords(int x, int y, int z, int ang, int horz)
Player *nPlayer = &PlayerList[nLocalPlayer];
spritetype *pSprite = &nPlayer->Actor()->s();
pSprite->ox = pSprite->pos.X = x;
pSprite->opos.X = pSprite->pos.X = x;
pSprite->oy = pSprite->pos.Y = y;
pSprite->oz = pSprite->pos.Z = z;