Removed GameApp.h from GameOptions.h - this should help prevent the precompiled header from rebuilding constantly when any header is touched, as GameApp.h ends up pulling virtually every other header by some level of indirection. We really need though to sit down at some point & refactor the inclusion tree. It's a big yarn ball at the moment.
This commit is contained in:
@@ -8,7 +8,6 @@ using std::string;
|
|||||||
#include <JGE.h>
|
#include <JGE.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include "SimplePad.h"
|
#include "SimplePad.h"
|
||||||
#include "GameApp.h"
|
|
||||||
|
|
||||||
#define GLOBAL_SETTINGS "settings/options.txt"
|
#define GLOBAL_SETTINGS "settings/options.txt"
|
||||||
#define PLAYER_SAVEFILE "data.dat"
|
#define PLAYER_SAVEFILE "data.dat"
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "MTGDeck.h"
|
#include "MTGDeck.h"
|
||||||
#include "GameOptions.h"
|
|
||||||
#include "Translate.h"
|
#include "Translate.h"
|
||||||
#include "OptionItem.h"
|
#include "OptionItem.h"
|
||||||
#include "StyleManager.h"
|
#include "StyleManager.h"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
#include "MenuItem.h"
|
#include "MenuItem.h"
|
||||||
#include "Translate.h"
|
#include "Translate.h"
|
||||||
|
#include "WResourceManager.h"
|
||||||
|
|
||||||
MenuItem::MenuItem(int id, WFont *font, string text, float x, float y, JQuad * _off, JQuad * _on, const char * particle,
|
MenuItem::MenuItem(int id, WFont *font, string text, float x, float y, JQuad * _off, JQuad * _on, const char * particle,
|
||||||
JQuad * particleTex, bool hasFocus) :
|
JQuad * particleTex, bool hasFocus) :
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#include "PrecompiledHeader.h"
|
#include "PrecompiledHeader.h"
|
||||||
|
|
||||||
#include "Translate.h"
|
#include "Translate.h"
|
||||||
|
#include "utils.h"
|
||||||
|
|
||||||
Translator * Translator::mInstance = NULL;
|
Translator * Translator::mInstance = NULL;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user