zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-27 06:12:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #200 from ChillyDoom/BotFixes

Browse source 
Bot fixes
This commit is contained in:
rheit 2014-12-23 21:34:57 -06:00
commit 39adff5e9e
2 changed files with 36 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/b_bot.h
View file

@ -130,7 +130,6 @@ private:
protected: protected:
bool ctf; bool ctf;
int loaded_bots;
int t_join; int t_join;
bool observer; //Consoleplayer is observer. bool observer; //Consoleplayer is observer.
}; };
@ -188,12 +187,12 @@ public:
fixed_t oldy; fixed_t oldy;
private: private:
//(B_think.cpp) //(b_think.cpp)
void Think (); void Think ();
void ThinkForMove (ticcmd_t *cmd); void ThinkForMove (ticcmd_t *cmd);
void Set_enemy (); void Set_enemy ();
//(B_func.cpp) //(b_func.cpp)
bool Reachable (AActor *target); bool Reachable (AActor *target);
void Dofire (ticcmd_t *cmd); void Dofire (ticcmd_t *cmd);
AActor *Choose_Mate (); AActor *Choose_Mate ();

62
src/b_game.cpp
View file

@ -216,19 +216,16 @@ bool FCajunMaster::SpawnBot (const char *name, int color)
"\\color\\cf df 90" //10 = Bleached Bone "\\color\\cf df 90" //10 = Bleached Bone
}; };
botinfo_t *thebot; botinfo_t *thebot = botinfo;
int botshift; int botshift = 0;
if (name) if (name)
{ {
thebot = botinfo;
// Check if exist or already in the game. // Check if exist or already in the game.
botshift = 0;
while (thebot && stricmp (name, thebot->name)) while (thebot && stricmp (name, thebot->name))
{ {
thebot = thebot->next;
botshift++; botshift++;
thebot = thebot->next;
} }
if (thebot == NULL) if (thebot == NULL)
@ -246,27 +243,36 @@ bool FCajunMaster::SpawnBot (const char *name, int color)
return false; return false;
} }
} }
else if (botnum < loaded_bots)
{
bool vacant = false; //Spawn a random bot from bots.cfg if no name given.
while (!vacant)
{
int rnum = (pr_botspawn() % loaded_bots);
thebot = botinfo;
botshift = 0;
while (rnum)
{
--rnum, thebot = thebot->next;
botshift++;
}
if (thebot->inuse == BOTINUSE_No)
vacant = true;
}
}
else else
{ {
Printf ("Couldn't spawn bot; no bot left in %s\n", BOTFILENAME); //Spawn a random bot from bots.cfg if no name given.
return false; TArray<botinfo_t *> BotInfoAvailable;
while (thebot)
{
if (thebot->inuse == BOTINUSE_No)
BotInfoAvailable.Push (thebot);
thebot = thebot->next;
}
if (BotInfoAvailable.Size () == 0)
{
Printf ("Couldn't spawn bot; no bot left in %s\n", BOTFILENAME);
return false;
}
thebot = BotInfoAvailable[pr_botspawn() % BotInfoAvailable.Size ()];
botinfo_t *thebot2 = botinfo;
while (thebot2)
{
if (thebot == thebot2)
break;
botshift++;
thebot2 = thebot2->next;
}
} }
thebot->inuse = BOTINUSE_Waiting; thebot->inuse = BOTINUSE_Waiting;
@ -478,7 +484,6 @@ void FCajunMaster::ForgetBots ()
} }
botinfo = NULL; botinfo = NULL;
loaded_bots = 0;
} }
bool FCajunMaster::LoadBots () bool FCajunMaster::LoadBots ()
@ -486,6 +491,7 @@ bool FCajunMaster::LoadBots ()
FScanner sc; FScanner sc;
FString tmp; FString tmp;
bool gotteam = false; bool gotteam = false;
int loaded_bots = 0;
bglobal.ForgetBots (); bglobal.ForgetBots ();
tmp = M_GetCajunPath(BOTFILENAME); tmp = M_GetCajunPath(BOTFILENAME);
@ -602,9 +608,9 @@ bool FCajunMaster::LoadBots ()
newinfo->next = bglobal.botinfo; newinfo->next = bglobal.botinfo;
newinfo->lastteam = TEAM_NONE; newinfo->lastteam = TEAM_NONE;
bglobal.botinfo = newinfo; bglobal.botinfo = newinfo;
bglobal.loaded_bots++; loaded_bots++;
} }
Printf ("%d bots read from %s\n", bglobal.loaded_bots, BOTFILENAME); Printf ("%d bots read from %s\n", loaded_bots, BOTFILENAME);
return true; return true;
} }