zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-06 13:50:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: removed opos entirely.

Browse source
This commit is contained in:
Christoph Oelckers 2021-01-10 18:30:56 +01:00
parent b0e5e9fc72
commit a74419f5e7
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/exhumed/src/map.cpp
View file

@ -50,8 +50,11 @@ void DrawMap(double const smoothratio)
{ {
if (!nFreeze && automapMode != am_off) if (!nFreeze && automapMode != am_off)
{ {
int x = PlayerList[nLocalPlayer].opos.x + MulScale(initx - PlayerList[nLocalPlayer].opos.x, smoothratio, 16); int nPlayerSprite = PlayerList[nLocalPlayer].nSprite;
int y = PlayerList[nLocalPlayer].opos.y + MulScale(inity - PlayerList[nLocalPlayer].opos.y, smoothratio, 16); auto psp = &sprite[nPlayerSprite];
int x = psp->interpolatedx(smoothratio);
int y = psp->interpolatedy(smoothratio);
int ang = (!SyncInput() ? PlayerList[nLocalPlayer].angle.sum() : PlayerList[nLocalPlayer].angle.interpolatedsum(smoothratio)).asbuild(); int ang = (!SyncInput() ? PlayerList[nLocalPlayer].angle.sum() : PlayerList[nLocalPlayer].angle.interpolatedsum(smoothratio)).asbuild();
DrawOverheadMap(x, y, ang, smoothratio); DrawOverheadMap(x, y, ang, smoothratio);
} }

6
source/exhumed/src/osdcmds.cpp
View file

@ -39,9 +39,9 @@ void GameInterface::WarpToCoords(int x, int y, int z, int ang, int horz)
Player *nPlayer = &PlayerList[nLocalPlayer]; Player *nPlayer = &PlayerList[nLocalPlayer];
spritetype *pSprite = &sprite[nPlayer->nSprite]; spritetype *pSprite = &sprite[nPlayer->nSprite];
nPlayer->opos.x = pSprite->x = x; pSprite->x = x;
nPlayer->opos.y = pSprite->y = y; pSprite->y = y;
nPlayer->opos.z = pSprite->z = z; pSprite->z = z;
if (ang != INT_MIN) if (ang != INT_MIN)
{ {

2
source/exhumed/src/player.cpp
View file

@ -335,7 +335,6 @@ void RestartPlayer(short nPlayer)
floorspr = -1; floorspr = -1;
} }
plr->opos = nSpr->pos;
plr->angle.backup(); plr->angle.backup();
plr->horizon.backup(); plr->horizon.backup();
@ -696,7 +695,6 @@ void FuncPlayer(int a, int nDamage, int nRun)
short nSprite2; short nSprite2;
PlayerList[nPlayer].opos = sprite[nPlayerSprite].pos;
PlayerList[nPlayer].angle.backup(); PlayerList[nPlayer].angle.backup();
PlayerList[nPlayer].horizon.backup(); PlayerList[nPlayer].horizon.backup();
PlayerList[nPlayer].angle.resetadjustment(); PlayerList[nPlayer].angle.resetadjustment();

1
source/exhumed/src/player.h
View file

@ -75,7 +75,6 @@ struct Player
PlayerHorizon horizon; PlayerHorizon horizon;
PlayerAngle angle; PlayerAngle angle;
vec3_t opos;
}; };
extern short PlayerCount; extern short PlayerCount;