zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix trains not moving spawn points with higher indexes than player count.

Browse source
This commit is contained in:
Jordon Moss 2020-05-17 16:55:21 -07:00 committed by Christoph Oelckers
parent d9b8f58558
commit 49deeb350e
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/duke3d/src/actors.cpp
View file

@ -6418,14 +6418,18 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
if (sector[pSprite->sectnum].lotag != ST_2_UNDERWATER) if (sector[pSprite->sectnum].lotag != ST_2_UNDERWATER)
{ {
// Move player spawns with sector.
for (int spawnNum = 0; spawnNum < g_playerSpawnCnt; spawnNum++)
{
if (g_playerSpawnPoints[spawnNum].sect == pSprite->sectnum)
{
g_playerSpawnPoints[spawnNum].pos.x += m;
g_playerSpawnPoints[spawnNum].pos.y += x;
}
}
for (TRAVERSE_CONNECT(playerNum)) for (TRAVERSE_CONNECT(playerNum))
{ {
if (g_playerSpawnPoints[playerNum].sect == pSprite->sectnum)
{
g_playerSpawnPoints[playerNum].pos.x += m;
g_playerSpawnPoints[playerNum].pos.y += x;
}
auto const pPlayer = g_player[playerNum].ps; auto const pPlayer = g_player[playerNum].ps;
// might happen when squished into void space // might happen when squished into void space
@ -6555,6 +6559,16 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
if (ud.noclip == 0) if (ud.noclip == 0)
MaybeTrainKillPlayer(pSprite, 0); MaybeTrainKillPlayer(pSprite, 0);
// Move player spawns with sector.
for (int spawnNum = 0; spawnNum < g_playerSpawnCnt; spawnNum++)
{
if (g_playerSpawnPoints[spawnNum].sect == pSprite->sectnum)
{
g_playerSpawnPoints[spawnNum].pos.x += l;
g_playerSpawnPoints[spawnNum].pos.y += x;
}
}
for (int TRAVERSE_CONNECT(playerNum)) for (int TRAVERSE_CONNECT(playerNum))
{ {
auto const pPlayer = g_player[playerNum].ps; auto const pPlayer = g_player[playerNum].ps;
@ -6570,12 +6584,6 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
pPlayer->bobpos.x += l; pPlayer->bobpos.x += l;
pPlayer->bobpos.y += x; pPlayer->bobpos.y += x;
} }
if (g_playerSpawnPoints[playerNum].sect == pSprite->sectnum)
{
g_playerSpawnPoints[playerNum].pos.x += l;
g_playerSpawnPoints[playerNum].pos.y += x;
}
} }
for (SPRITES_OF_SECT(pSprite->sectnum, j)) for (SPRITES_OF_SECT(pSprite->sectnum, j))