mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanly shutdown in case of invalid g1.dat (#7361)

This commit is contained in:
Michał Janiszewski 2018-03-30 16:38:22 +02:00 committed by Ted John
parent e960b3f150
commit 3b7864957a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/openrct2/Context.cpp
View File

@ -372,7 +372,10 @@ namespace OpenRCT2
if (!gOpenRCT2NoGraphics)
{
LoadBaseGraphics();
if (!LoadBaseGraphics())
{
return false;
}
#ifdef __ENABLE_LIGHTFX__
lightfx_init();
#endif
@ -512,12 +515,16 @@ namespace OpenRCT2
return result;
}
void LoadBaseGraphics()
bool LoadBaseGraphics()
{
gfx_load_g1(_env);
if (!gfx_load_g1(_env))
{
return false;
}
gfx_load_g2();
gfx_load_csg();
font_sprite_initialise_characters();
return true;
}
/**