From 00b49282bed6f3250e0766c9332b0e0d18227584 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 9 Jan 2019 19:02:02 +0100
Subject: [PATCH] - the missing parts of last commit.

---
 src/b_game.cpp                      | 5 ++---
 src/g_game.cpp                      | 2 +-
 src/g_level.cpp                     | 2 ++
 src/hwrenderer/scene/hw_sprites.cpp | 2 +-
 src/p_saveg.cpp                     | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/b_game.cpp b/src/b_game.cpp
index 144afb8fa7..2aeb7d37ce 100644
--- a/src/b_game.cpp
+++ b/src/b_game.cpp
@@ -130,7 +130,7 @@ FCajunMaster::~FCajunMaster()
 }
 
 //This function is called every tick (from g_game.c).
-void FCajunMaster::Main ()
+void FCajunMaster::Main(FLevelLocals *Level)
 {
 	BotThinkCycles.Reset();
 
@@ -138,7 +138,7 @@ void FCajunMaster::Main ()
 		return;
 
 	//Add new bots?
-	if (wanted_botnum > botnum && !freeze)
+	if (wanted_botnum > botnum && !Level->freeze)
 	{
 		if (t_join == ((wanted_botnum - botnum) * SPAWN_DELAY))
 		{
@@ -177,7 +177,6 @@ void FCajunMaster::Init ()
 	botnum = 0;
 	firstthing = nullptr;
 	spawn_tries = 0;
-	freeze = false;
 	observer = false;
 	body1 = nullptr;
 	body2 = nullptr;
diff --git a/src/g_game.cpp b/src/g_game.cpp
index ee39061e03..af9cd54915 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -1103,7 +1103,7 @@ void G_Ticker ()
 	uint32_t rngsum = FRandom::StaticSumSeeds ();
 
 	//Added by MC: For some of that bot stuff. The main bot function.
-	bglobal.Main ();
+	bglobal.Main (&level);
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
diff --git a/src/g_level.cpp b/src/g_level.cpp
index b5362d2edb..46713326f7 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -1477,6 +1477,8 @@ void FLevelLocals::InitLevelLocals ()
 	flags = 0;
 	flags2 = 0;
 	flags3 = 0;
+	freeze = false;
+	changefreeze = false;
 
 	info = FindLevelInfo (MapName);
 
diff --git a/src/hwrenderer/scene/hw_sprites.cpp b/src/hwrenderer/scene/hw_sprites.cpp
index 63b63c6996..03ab9c2ae3 100644
--- a/src/hwrenderer/scene/hw_sprites.cpp
+++ b/src/hwrenderer/scene/hw_sprites.cpp
@@ -1198,7 +1198,7 @@ void GLSprite::ProcessParticle (HWDrawInfo *di, particle_t *particle, sector_t *
 
     const auto &vp = di->Viewpoint;
 	double timefrac = vp.TicFrac;
-	if (paused || Level->freeze || (di->Level->flags2 & LEVEL2_FROZEN))
+	if (paused || di->Level->freeze || (di->Level->flags2 & LEVEL2_FROZEN))
 		timefrac = 0.;
 	float xvf = (particle->Vel.X) * timefrac;
 	float yvf = (particle->Vel.Y) * timefrac;
diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp
index f6afdff65d..756c28e8af 100644
--- a/src/p_saveg.cpp
+++ b/src/p_saveg.cpp
@@ -986,7 +986,7 @@ void G_SerializeLevel(FSerializer &arc, FLevelLocals *Level, bool hubload)
 		("acsthinker", Level->ACSThinker)
 		("impactdecalcount", Level->ImpactDecalCount)
 		("freeze", Level->freeze)
-		("changefreeze", Level->changefreeze
+		("changefreeze", Level->changefreeze);
 
 	// Hub transitions must keep the current total time
 	if (!hubload)