teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- PlayerPushSect

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-22 21:09:24 +01:00
parent 5e01841f1e
commit cdef530597
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/games/exhumed/src/player.cpp
View file

@ -1046,7 +1046,7 @@ void AIPlayer::Tick(RunListEvent* ev)
if (nDiff <= 256)
{
PlayerList[nPlayer].nPlayerPushSect = sectnum;
PlayerList[nPlayer].pPlayerPushSect = sect;
int xvel = sPlayerInput[nPlayer].xVel;
int yvel = sPlayerInput[nPlayer].yVel;
@ -1058,7 +1058,7 @@ void AIPlayer::Tick(RunListEvent* ev)
if (PlayerList[nPlayer].nPlayerPushSound <= -1)
{
PlayerList[nPlayer].nPlayerPushSound = 1;
int nBlock = sector[PlayerList[nPlayer].nPlayerPushSect].extra;
int nBlock = PlayerList[nPlayer].pPlayerPushSect->extra;
auto pBlockActor = sBlockInfo[nBlock].pActor;
D3PlayFX(StaticSound[kSound23], pBlockActor, 0x4000);
@ -1083,9 +1083,9 @@ void AIPlayer::Tick(RunListEvent* ev)
// loc_1AB46:
if (PlayerList[nPlayer].nPlayerPushSound > -1)
{
if (PlayerList[nPlayer].nPlayerPushSect > -1)
if (PlayerList[nPlayer].pPlayerPushSect != nullptr)
{
StopActorSound(sBlockInfo[sector[PlayerList[nPlayer].nPlayerPushSect].extra].pActor);
StopActorSound(sBlockInfo[PlayerList[nPlayer].pPlayerPushSect->extra].pActor);
}
PlayerList[nPlayer].nPlayerPushSound = -1;
@ -2656,7 +2656,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, Player& w, Player*
("torch", w.nTorch)
("breathtimer", w.nBreathTimer)
("playerswear", w.nPlayerSwear)
("pushsect", w.nPlayerPushSect)
("pushsect", w.pPlayerPushSect)
("deathtype", w.nDeathType)
("score", w.nPlayerScore)
("color", w.nPlayerColor)

2
source/games/exhumed/src/player.h
View file

@ -89,10 +89,10 @@ struct Player
PlayerHorizon horizon;
PlayerAngle angle;
sectortype* pPlayerPushSect;
int16_t nBreathTimer;
int16_t nPlayerSwear;
int nPlayerPushSect;
int16_t nDeathType;
int16_t nPlayerScore;
int16_t nPlayerColor;