mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-28 18:00:40 +00:00
- Exhumed: removed opos entirely.
This commit is contained in:
parent
b0e5e9fc72
commit
a74419f5e7
4 changed files with 8 additions and 8 deletions
|
@ -50,8 +50,11 @@ void DrawMap(double const smoothratio)
|
|||
{
|
||||
if (!nFreeze && automapMode != am_off)
|
||||
{
|
||||
int x = PlayerList[nLocalPlayer].opos.x + MulScale(initx - PlayerList[nLocalPlayer].opos.x, smoothratio, 16);
|
||||
int y = PlayerList[nLocalPlayer].opos.y + MulScale(inity - PlayerList[nLocalPlayer].opos.y, smoothratio, 16);
|
||||
int nPlayerSprite = PlayerList[nLocalPlayer].nSprite;
|
||||
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();
|
||||
DrawOverheadMap(x, y, ang, smoothratio);
|
||||
}
|
||||
|
|
|
@ -39,9 +39,9 @@ void GameInterface::WarpToCoords(int x, int y, int z, int ang, int horz)
|
|||
Player *nPlayer = &PlayerList[nLocalPlayer];
|
||||
spritetype *pSprite = &sprite[nPlayer->nSprite];
|
||||
|
||||
nPlayer->opos.x = pSprite->x = x;
|
||||
nPlayer->opos.y = pSprite->y = y;
|
||||
nPlayer->opos.z = pSprite->z = z;
|
||||
pSprite->x = x;
|
||||
pSprite->y = y;
|
||||
pSprite->z = z;
|
||||
|
||||
if (ang != INT_MIN)
|
||||
{
|
||||
|
|
|
@ -335,7 +335,6 @@ void RestartPlayer(short nPlayer)
|
|||
floorspr = -1;
|
||||
}
|
||||
|
||||
plr->opos = nSpr->pos;
|
||||
plr->angle.backup();
|
||||
plr->horizon.backup();
|
||||
|
||||
|
@ -696,7 +695,6 @@ void FuncPlayer(int a, int nDamage, int nRun)
|
|||
|
||||
short nSprite2;
|
||||
|
||||
PlayerList[nPlayer].opos = sprite[nPlayerSprite].pos;
|
||||
PlayerList[nPlayer].angle.backup();
|
||||
PlayerList[nPlayer].horizon.backup();
|
||||
PlayerList[nPlayer].angle.resetadjustment();
|
||||
|
|
|
@ -75,7 +75,6 @@ struct Player
|
|||
|
||||
PlayerHorizon horizon;
|
||||
PlayerAngle angle;
|
||||
vec3_t opos;
|
||||
};
|
||||
|
||||
extern short PlayerCount;
|
||||
|
|
Loading…
Reference in a new issue