- Moved "game mode" types of awards outside of a code, and inside of a configuration file (rules/awards.dat). No code is required anymore to create such an award (momir, hermit basic, etc...)
- fixed compilation errors in GameObserver (windows)
This commit is contained in:
@@ -29,6 +29,7 @@
|
||||
#include "Rules.h"
|
||||
#include "ModRules.h"
|
||||
#include "JFileSystem.h"
|
||||
#include "Credits.h"
|
||||
|
||||
#define DEFAULT_DURATION .25
|
||||
|
||||
@@ -138,6 +139,9 @@ void GameApp::Create()
|
||||
//Load Mod Rules before everything else
|
||||
gModRules.load("rules/modrules.xml");
|
||||
|
||||
//Load awards (needs to be loaded before any option are accessed)
|
||||
Unlockable::load();
|
||||
|
||||
//Link this to our settings manager.
|
||||
options.theGame = this;
|
||||
|
||||
@@ -316,6 +320,7 @@ void GameApp::Destroy()
|
||||
DeckEditorMenu::destroy();
|
||||
|
||||
options.theGame = NULL;
|
||||
Unlockable::Destroy();
|
||||
|
||||
Rules::unloadAllRules();
|
||||
LOG("==Destroying GameApp Successful==");
|
||||
|
||||
Reference in New Issue
Block a user