Permalink
Browse files

- the missing parts of last commit.

  • Loading branch information...
coelckers committed Jan 9, 2019
1 parent 4227b90 commit 00b49282bed6f3250e0766c9332b0e0d18227584
Showing with 7 additions and 6 deletions.
  1. +2 −3 src/b_game.cpp
  2. +1 −1 src/g_game.cpp
  3. +2 −0 src/g_level.cpp
  4. +1 −1 src/hwrenderer/scene/hw_sprites.cpp
  5. +1 −1 src/p_saveg.cpp
@@ -130,15 +130,15 @@ FCajunMaster::~FCajunMaster()
}

//This function is called every tick (from g_game.c).
void FCajunMaster::Main ()
void FCajunMaster::Main(FLevelLocals *Level)
{
BotThinkCycles.Reset();

if (demoplayback || gamestate != GS_LEVEL || consoleplayer != Net_Arbitrator)
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;
@@ -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++)
{
@@ -1477,6 +1477,8 @@ void FLevelLocals::InitLevelLocals ()
flags = 0;
flags2 = 0;
flags3 = 0;
freeze = false;
changefreeze = false;

info = FindLevelInfo (MapName);

@@ -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;
@@ -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)

0 comments on commit 00b4928

Please sign in to comment.