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

- fixed: Failure to open bots.cfg would throw an exception that prevented the level from starting. Catch it in FCajunMaster::LoadBots instead and handle it non-disruptively.

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-03 11:11:25 +01:00
parent 74c326e9b2
commit ede07f93b2
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/b_game.cpp
View file

@ -60,6 +60,7 @@ Everything that is changed is marked (maybe commented) with "Added by MC"
#include "d_net.h" #include "d_net.h"
#include "d_netinf.h" #include "d_netinf.h"
#include "d_player.h" #include "d_player.h"
#include "doomerrors.h"
static FRandom pr_botspawn ("BotSpawn"); static FRandom pr_botspawn ("BotSpawn");
@ -496,7 +497,15 @@ bool FCajunMaster::LoadBots ()
DPrintf ("No " BOTFILENAME ", so no bots\n"); DPrintf ("No " BOTFILENAME ", so no bots\n");
return false; return false;
} }
sc.OpenFile(tmp); try
{
sc.OpenFile(tmp);
}
catch (CRecoverableError &err)
{
Printf("%s. So no bots\n", err.GetMessage());
return false;
}
while (sc.GetString ()) while (sc.GetString ())
{ {