mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-13 07:57:52 +00:00
- init bot specific actor properties righr after parsing DECORATE, not when spawning the first bot (which is too late.)
SVN r3032 (trunk)
This commit is contained in:
parent
572bc4620a
commit
ececec1c65
3 changed files with 2 additions and 8 deletions
|
@ -105,11 +105,6 @@ FArchive &operator<< (FArchive &arc, botskill_t &skill)
|
||||||
// This is intentionally not in the weapon definition anymore.
|
// This is intentionally not in the weapon definition anymore.
|
||||||
void InitBotStuff()
|
void InitBotStuff()
|
||||||
{
|
{
|
||||||
static bool done = false;
|
|
||||||
|
|
||||||
if (done) return;
|
|
||||||
done = true;
|
|
||||||
|
|
||||||
static struct BotInit
|
static struct BotInit
|
||||||
{
|
{
|
||||||
const char *type;
|
const char *type;
|
||||||
|
|
|
@ -63,8 +63,6 @@ Everything that is changed is marked (maybe commented) with "Added by MC"
|
||||||
|
|
||||||
static FRandom pr_botspawn ("BotSpawn");
|
static FRandom pr_botspawn ("BotSpawn");
|
||||||
|
|
||||||
void InitBotStuff();
|
|
||||||
|
|
||||||
//Externs
|
//Externs
|
||||||
FCajunMaster bglobal;
|
FCajunMaster bglobal;
|
||||||
|
|
||||||
|
@ -321,7 +319,6 @@ bool FCajunMaster::SpawnBot (const char *name, int color)
|
||||||
|
|
||||||
waitingforspawn[playernumber] = true;
|
waitingforspawn[playernumber] = true;
|
||||||
|
|
||||||
InitBotStuff();
|
|
||||||
Net_WriteByte (DEM_ADDBOT);
|
Net_WriteByte (DEM_ADDBOT);
|
||||||
Net_WriteByte (playernumber);
|
Net_WriteByte (playernumber);
|
||||||
{
|
{
|
||||||
|
|
|
@ -52,6 +52,7 @@
|
||||||
#include "g_level.h"
|
#include "g_level.h"
|
||||||
|
|
||||||
extern void LoadActors ();
|
extern void LoadActors ();
|
||||||
|
extern void InitBotStuff();
|
||||||
|
|
||||||
|
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
|
@ -121,6 +122,7 @@ void FActorInfo::StaticInit ()
|
||||||
|
|
||||||
Printf ("LoadActors: Load actor definitions.\n");
|
Printf ("LoadActors: Load actor definitions.\n");
|
||||||
LoadActors ();
|
LoadActors ();
|
||||||
|
InitBotStuff();
|
||||||
}
|
}
|
||||||
|
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
|
|
Loading…
Reference in a new issue