OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved bglobal into FLevelLocals

Browse source 
This is still all static data, only the location has changed, but none of the access.
This commit is contained in:
Christoph Oelckers 2019-01-30 01:38:18 +01:00
commit e30f116faf
20 changed files with 72 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/g_game.cpp
View file

@ -219,6 +219,8 @@ bool SendLand;
const AActor *SendItemUse, *SendItemDrop;
int SendItemDropAmount;
extern uint8_t globalfreeze;
EXTERN_CVAR (Int, team)
CVAR (Bool, teamplay, false, CVAR_SERVERINFO)
@ -1111,7 +1113,7 @@ void G_Ticker ()
uint32_t rngsum = FRandom::StaticSumSeeds ();
//Added by MC: For some of that bot stuff. The main bot function.
bglobal.Main (&level);
level.BotInfo.Main (&level);
for (i = 0; i < MAXPLAYERS; i++)
{
@ -1894,7 +1896,7 @@ void G_DoLoadGame ()
// Read intermission data for hubs
G_SerializeHub(arc);
bglobal.RemoveAllBots(&level, true);
level.BotInfo.RemoveAllBots(&level, true);
FString cvar;
arc("importantcvars", cvar);
@ -1907,7 +1909,8 @@ void G_DoLoadGame ()
uint32_t time[2] = { 1,0 };
arc("ticrate", time[0])
("leveltime", time[1]);
("leveltime", time[1])
("globalfreeze", globalfreeze);
// dearchive all the modifications
level.time = Scale(time[1], TICRATE, time[0]);
@ -2887,7 +2890,7 @@ DEFINE_GLOBAL(multiplayer)
DEFINE_GLOBAL(gameaction)
DEFINE_GLOBAL(gamestate)
DEFINE_GLOBAL(skyflatnum)
DEFINE_GLOBAL_NAMED(bglobal.freeze, globalfreeze)
DEFINE_GLOBAL(globalfreeze)
DEFINE_GLOBAL(gametic)
DEFINE_GLOBAL(demoplayback)
DEFINE_GLOBAL(automapactive);