zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 04:24:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Wrap calls that set PLAYER::PlayerNowPosition.

Browse source
This commit is contained in:
Mitchell Richters 2022-11-16 14:28:05 +11:00 committed by Christoph Oelckers
parent 4bf202bee4
commit 11f9d82239
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/sw/src/game.cpp
View file

@ -408,7 +408,7 @@ void InitLevel(MapRecord *maprec)
SpawnSpriteDef sprites;
DVector3 ppos;
loadMap(maprec->fileName, SW_SHAREWARE ? 1 : 0, &ppos, &ang, &cursect, sprites);
Player[0].PlayerNowPosition = ppos;
Player[0].posSet(ppos);
spawnactors(sprites);
Player[0].cursector = cursect;

5
source/games/sw/src/game.h
View file

@ -732,6 +732,11 @@ struct PLAYER
{
return PlayerNowPosition.Z;
}
void posSet(const DVector3& val)
{
PlayerNowPosition = val;
}
};
extern PLAYER Player[MAX_SW_PLAYERS_REG+1];

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

@ -56,7 +56,7 @@ BEGIN_SW_NS
void GameInterface::WarpToCoords(double x, double y, double z, DAngle ang)
{
Player->PlayerNowPosition = DVector3(x,y,z);
Player->posSet(DVector3(x,y,z));
Player->PlayerPrevPosition = Player->PlayerNowPosition;

12
source/games/sw/src/player.cpp
View file

@ -1312,7 +1312,8 @@ void DoPlayerTeleportPause(PLAYER* pp)
void DoPlayerTeleportToSprite(PLAYER* pp, DVector3& pos, DAngle ang)
{
pp->angle.ang = pp->angle.oang = ang;
pp->PlayerPrevPosition = pp->PlayerNowPosition= pos.plusZ(-PLAYER_HEIGHTF);
pp->posSet(pos.plusZ(-PLAYER_HEIGHTF));
pp->PlayerPrevPosition = pos.plusZ(-PLAYER_HEIGHTF);
pp->PlayerOldPosition.XY() = pp->posXY();
updatesector(pp->PlayerNowPosition, &pp->cursector);
@ -2050,7 +2051,7 @@ void PlayerCheckValidMove(PLAYER* pp)
{
if (!pp->insector())
{
pp->PlayerNowPosition = pp->PlayerOldPosition;
pp->posSet(pp->PlayerOldPosition);
pp->cursector = pp->lastcursector;
}
}
@ -5406,7 +5407,7 @@ void RemoteToPlayer(PLAYER* pp)
pp->setcursector(pp->remote.cursectp);
pp->lastcursector = pp->remote.lastcursectp;
pp->PlayerNowPosition = pp->remote.pos;
pp->posSet(pp->remote.pos);
pp->vect = pp->remote.vect;
pp->ovect = pp->remote.ovect;
@ -7173,7 +7174,8 @@ void InitAllPlayers(void)
// Initialize all [MAX_SW_PLAYERS] arrays here!
for (pp = Player; pp < &Player[MAX_SW_PLAYERS]; pp++)
{
pp->PlayerNowPosition = pp->PlayerPrevPosition = pfirst->PlayerNowPosition;
pp->posSet(pfirst->PlayerNowPosition);
pp->PlayerPrevPosition = pfirst->PlayerNowPosition;
pp->angle.ang = pp->angle.oang = pfirst->angle.ang;
pp->horizon.horiz = pp->horizon.ohoriz = pfirst->horizon.horiz;
pp->cursector = pfirst->cursector;
@ -7333,7 +7335,7 @@ void PlayerSpawnPosition(PLAYER* pp)
ASSERT(spawn_sprite != nullptr);
pp->PlayerNowPosition = spawn_sprite->spr.pos;
pp->posSet(spawn_sprite->spr.pos);
pp->PlayerPrevPosition = pp->PlayerNowPosition;
pp->angle.ang = pp->angle.oang = spawn_sprite->spr.angle;
pp->setcursector(spawn_sprite->sector());