OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- redirect most references to the global players array through FLevelLocals.

Browse source 
The Map loader may not access any global state at all - everything it can touch must be exchangable.
Furthermore, if we want to sandbox each level, there may be no direct access to any kind of global state whatsoever from the play code.
This commit is contained in:
Christoph Oelckers 2019-01-30 01:15:32 +01:00
commit 8bbdee5c28
19 changed files with 259 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/p_setup.cpp
View file

@ -378,13 +378,13 @@ void P_SetupLevel(FLevelLocals *Level, int position, bool newGame)
Level->SetMusicVolume(Level->MusicVolume);
for (i = 0; i < MAXPLAYERS; ++i)
{
players[i].killcount = players[i].secretcount
= players[i].itemcount = 0;
Level->Players[i]->killcount = Level->Players[i]->secretcount
= Level->Players[i]->itemcount = 0;
}
}
for (i = 0; i < MAXPLAYERS; ++i)
{
players[i].mo = nullptr;
Level->Players[i]->mo = nullptr;
}
// [RH] Clear any scripted translation colors the previous level may have set.
for (i = 0; i < int(translationtables[TRANSLATION_LevelScripted].Size()); ++i)
@ -439,9 +439,9 @@ void P_SetupLevel(FLevelLocals *Level, int position, bool newGame)
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i])
if (Level->PlayerInGame(i))
{
players[i].mo = nullptr;
Level->Players[i]->mo = nullptr;
Level->DeathMatchSpawnPlayer(i);
}
}
@ -451,9 +451,9 @@ void P_SetupLevel(FLevelLocals *Level, int position, bool newGame)
{
for (i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i])
if (Level->PlayerInGame(i))
{
players[i].mo = nullptr;
Level->Players[i]->mo = nullptr;
FPlayerStart *mthing = Level->PickPlayerStart(i);
Level->SpawnPlayer(mthing, i, (Level->flags2 & LEVEL2_PRERAISEWEAPON) ? SPF_WEAPONFULLYUP : 0);
}
@ -466,11 +466,12 @@ void P_SetupLevel(FLevelLocals *Level, int position, bool newGame)
{
for (i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i] && players[i].mo != nullptr)
auto p = Level->Players[i];
if (Level->PlayerInGame(i) && p->mo != nullptr)
{
if (!(players[i].mo->flags & MF_FRIENDLY))
if (!(p->mo->flags & MF_FRIENDLY))
{
AActor * oldSpawn = players[i].mo;
AActor * oldSpawn = p->mo;
Level->DeathMatchSpawnPlayer(i);
oldSpawn->Destroy();
}