OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: DCajunMaster::End was missing a write barrier for getspawned. The

Browse source 
same problem in D_DoomMain.
- Made bglobal a pointer because it was causing problems with the garbage 
  collector.


SVN r859 (trunk)
This commit is contained in:
Christoph Oelckers 2008-03-27 22:37:13 +00:00
commit 997533e0c8
22 changed files with 131 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/d_main.cpp
View file

@ -242,19 +242,19 @@ static const char *IWADNames[] =
"hexen.wad",
"hexdd.wad",
"strife1.wad",
"strife0.wad",
#ifdef unix
"DOOM2.WAD", // Also look for all-uppercase names
"PLUTONIA.WAD",
"TNT.WAD",
"DOOM.WAD",
"DOOM1.WAD",
"HERETIC.WAD",
"HERETIC1.WAD",
"HEXEN.WAD",
"HEXDD.WAD",
"STRIFE1.WAD",
"STRIFE0.WAD",
"strife0.wad",
#ifdef unix
"DOOM2.WAD", // Also look for all-uppercase names
"PLUTONIA.WAD",
"TNT.WAD",
"DOOM.WAD",
"DOOM1.WAD",
"HERETIC.WAD",
"HERETIC1.WAD",
"HEXEN.WAD",
"HEXDD.WAD",
"STRIFE1.WAD",
"STRIFE0.WAD",
#endif
NULL
};
@ -718,7 +718,7 @@ void D_Display ()
void D_ErrorCleanup ()
{
screen->Unlock ();
bglobal.RemoveAllBots (true);
bglobal->RemoveAllBots (true);
D_QuitNetGame ();
if (demorecording || demoplayback)
G_CheckDemoStatus ();
@ -772,7 +772,7 @@ void D_DoomLoop ()
players[i].savedpitch = players[i].mo->pitch;
}
}
bglobal.Main (maketic%BACKUPTICS);
bglobal->Main (maketic%BACKUPTICS);
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && players[i].isbot && players[i].mo)
@ -2433,16 +2433,17 @@ void D_DoomMain (void)
}
//Added by MC:
bglobal.getspawned = Args->GatherFiles ("-bots", "", false);
if (bglobal.getspawned->NumArgs() == 0)
bglobal->getspawned = Args->GatherFiles ("-bots", "", false);
if (bglobal->getspawned->NumArgs() == 0)
{
bglobal.getspawned->Destroy();
bglobal.getspawned = NULL;
bglobal->getspawned->Destroy();
bglobal->getspawned = NULL;
}
else
{
bglobal.spawn_tries = 0;
bglobal.wanted_botnum = bglobal.getspawned->NumArgs();
GC::WriteBarrier(bglobal, bglobal->getspawned);
bglobal->spawn_tries = 0;
bglobal->wanted_botnum = bglobal->getspawned->NumArgs();
}
Printf ("M_Init: Init miscellaneous info.\n");