OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- made most of the player spawn spot handliing functions members of FLevelLocals.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-28 02:44:05 +01:00
commit 66695ac6a0
11 changed files with 84 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/p_setup.cpp
View file

@ -445,7 +445,7 @@ void P_SetupLevel(FLevelLocals *Level, int position, bool newGame)
if (playeringame[i])
{
players[i].mo = nullptr;
G_DeathMatchSpawnPlayer(i);
Level->DeathMatchSpawnPlayer(i);
}
}
}
@ -457,7 +457,7 @@ void P_SetupLevel(FLevelLocals *Level, int position, bool newGame)
if (playeringame[i])
{
players[i].mo = nullptr;
FPlayerStart *mthing = G_PickPlayerStart(i);
FPlayerStart *mthing = Level->PickPlayerStart(i);
P_SpawnPlayer(mthing, i, (Level->flags2 & LEVEL2_PRERAISEWEAPON) ? SPF_WEAPONFULLYUP : 0);
}
}
@ -474,7 +474,7 @@ void P_SetupLevel(FLevelLocals *Level, int position, bool newGame)
if (!(players[i].mo->flags & MF_FRIENDLY))
{
AActor * oldSpawn = players[i].mo;
G_DeathMatchSpawnPlayer(i);
Level->DeathMatchSpawnPlayer(i);
oldSpawn->Destroy();
}
}