mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-31 19:51:44 +02:00
Code Issues Projects Releases Wiki Activity

No more game crashing for xml errors

Browse Source
This commit is contained in:
titiger
2016-11-23 00:31:54 +01:00
parent 0c5e9241f1
commit 32c7208a18
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/glest_game/game/game.h
View File

@@ -243,6 +243,7 @@ public:
GameSettings *getGameSettings() {return &gameSettings;} GameSettings *getGameSettings() {return &gameSettings;}
void setGameSettings(GameSettings *settings) { gameSettings = *settings;} void setGameSettings(GameSettings *settings) { gameSettings = *settings;}
const GameSettings *getReadOnlyGameSettings() const {return &gameSettings;} const GameSettings *getReadOnlyGameSettings() const {return &gameSettings;}
void setQuitPendingIndicator() { quitPendingIndicator = true;}
const GameCamera *getGameCamera() const {return &gameCamera;} const GameCamera *getGameCamera() const {return &gameCamera;}
GameCamera *getGameCameraPtr() {return &gameCamera;} GameCamera *getGameCameraPtr() {return &gameCamera;}

1
source/glest_game/main/program.cpp
View File

@@ -706,6 +706,7 @@ void Program::setState(ProgramState *programStateNew, bool cleanupOldState) {
try { try {
Game *game = dynamic_cast<Game *>(programStateNew); Game *game = dynamic_cast<Game *>(programStateNew);
Renderer &renderer= Renderer::getInstance(); Renderer &renderer= Renderer::getInstance();
game->setQuitPendingIndicator();// by this the world is no more updated
renderer.initGame(game,game->getGameCameraPtr()); renderer.initGame(game,game->getGameCameraPtr());
} }
catch(megaglest_runtime_error& ex2) { catch(megaglest_runtime_error& ex2) {