Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.

projects/mtg/include/AllAbilities.h

@@ -9,7 +9,6 @@
 #include "CardDisplay.h"
 #include "Subtypes.h"
 #include "CardGui.h"
-#include "GameOptions.h"
 #include "Token.h"
 #include "Counters.h"
 #include "WEvent.h"

projects/mtg/include/Credits.h

@@ -9,6 +9,7 @@
 #include "Player.h"
 
 class GameApp;
+class DeckStats;
 
 using namespace std;
 

projects/mtg/include/GameApp.h

@@ -15,7 +15,6 @@
 #include "WResourceManager.h"
 
 #include "GameState.h"
-#include "GameOptions.h"
 
 #include "MTGDeck.h"
 #include "MTGCard.h"

projects/mtg/include/GameStateDeckViewer.h

@@ -11,7 +11,6 @@
 #include "SimpleMenu.h"
 #include "WResourceManager.h"
 #include "CardGui.h"
-#include "GameOptions.h"
 #include "PriceList.h"
 #include "PlayerData.h"
 #include "DeckDataWrapper.h"

projects/mtg/include/OptionItem.h

@@ -9,7 +9,6 @@
 #include <string>
 #include "GameApp.h"
 #include "GameStateOptions.h"
-#include "GameOptions.h"
 #include "WFilter.h"
 #include "WDataSrc.h"
 #include "WGui.h"

projects/mtg/include/PrecompiledHeader.h

@@ -19,6 +19,8 @@
 #include "JFileSystem.h"
 #include "JLogger.h"
 
+#include "GameOptions.h"
+
 #include <boost/shared_ptr.hpp>
 
 #endif //PRECOMPILEDHEADER_H

projects/mtg/src/ActionStack.cpp

@@ -8,7 +8,6 @@ The Action Stack contains all information for Game Events that can be interrupte
 #include "CardSelectorSingleton.h"
 #include "Damage.h"
 #include "GameObserver.h"
-#include "GameOptions.h"
 #include "ManaCost.h"
 #include "MTGAbility.h"
 #include "Subtypes.h"

projects/mtg/src/Credits.cpp

@@ -2,7 +2,6 @@
 
 #include "Credits.h"
 #include "GameApp.h"
-#include "GameOptions.h"
 #include "PlayerData.h"
 #include "DeckStats.h"
 #include "Translate.h"

projects/mtg/src/GameObserver.cpp

@@ -1,7 +1,6 @@
 #include "PrecompiledHeader.h"
 
 #include "GameObserver.h"
-#include "GameOptions.h"
 #include "CardGui.h"
 #include "Damage.h"
 #include "Rules.h"

projects/mtg/src/GameStateAwards.cpp

@@ -9,7 +9,6 @@
 #include "MTGDeck.h"
 #include "Translate.h"
 #include "OptionItem.h"
-#include "GameOptions.h"
 #include "DeckDataWrapper.h"
 
 enum ENUM_AWARDS_STATE

projects/mtg/src/GameStateDuel.cpp

@@ -2,7 +2,6 @@
 
 #include "DeckMenu.h"
 #include "GameStateDuel.h"
-#include "GameOptions.h"
 #include "utils.h"
 #include "AIPlayer.h"
 #include "AIMomirPlayer.h"

projects/mtg/src/GameStateMenu.cpp

@@ -10,7 +10,6 @@
 #include "GameStateMenu.h"
 #include "DeckManager.h"
 #include "MenuItem.h"
-#include "GameOptions.h"
 #include "GameApp.h"
 #include "MTGCard.h"
 #include "Translate.h"

projects/mtg/src/GameStateOptions.cpp

@@ -5,7 +5,6 @@
 #include "OptionItem.h"
 #include "SimpleMenu.h"
 #include "SimplePad.h"
-#include "GameOptions.h"
 #include "Translate.h"
 
 namespace

projects/mtg/src/GameStateShop.cpp

@@ -9,7 +9,6 @@
 #include "MTGDeck.h"
 #include "MTGPack.h"
 #include "Translate.h"
-#include "GameOptions.h"
 #include "TestSuiteAI.h"
 
 #include <hge/hgedistort.h>

projects/mtg/src/GameStateTransitions.cpp

@@ -7,7 +7,6 @@
 #include "MTGDeck.h"
 #include "Translate.h"
 #include "OptionItem.h"
-#include "GameOptions.h"
 
 TransitionBase::TransitionBase(GameApp* parent, GameState* _from, GameState* _to, float duration) :
     GameState(parent)

projects/mtg/src/MTGGameZones.cpp

@@ -2,7 +2,6 @@
 
 #include "MTGGameZones.h"
 #include "Player.h"
-#include "GameOptions.h"
 #include "WEvent.h"
 #include "MTGDeck.h"
 #include "Subtypes.h"

projects/mtg/src/MTGRules.cpp

@@ -4,7 +4,6 @@
 #include "MTGRules.h"
 #include "Translate.h"
 #include "Subtypes.h"
-#include "GameOptions.h"
 #include "Credits.h"
 
 MTGEventBonus::MTGEventBonus(int _id) :

projects/mtg/src/MenuItem.cpp

@@ -1,7 +1,6 @@
 #include "PrecompiledHeader.h"
 
 #include "MenuItem.h"
-#include "GameOptions.h"
 #include "Translate.h"
 
 MenuItem::MenuItem(int id, WFont *font, string text, float x, float y, JQuad * _off, JQuad * _on, const char * particle,

projects/mtg/src/PlayerData.cpp

@@ -1,6 +1,5 @@
 #include "PrecompiledHeader.h"
 
-#include "GameOptions.h"
 #include "PlayerData.h"
 
 #include <stdio.h>

projects/mtg/src/PriceList.cpp

@@ -1,6 +1,8 @@
 #include "PrecompiledHeader.h"
 
 #include "PriceList.h"
+#include "utils.h"
+#include "MTGCard.h"
 
 int PriceList::randomKey = 0;
 

projects/mtg/src/Translate.cpp

@@ -1,7 +1,6 @@
 #include "PrecompiledHeader.h"
 
 #include "Translate.h"
-#include "GameOptions.h"
 
 Translator * Translator::mInstance = NULL;
 

projects/mtg/src/WCachedResource.cpp

@@ -2,7 +2,6 @@
 
 #include "utils.h"
 #include <JFileSystem.h>
-#include "GameOptions.h"
 #include "WResourceManager.h"
 #include "WCachedResource.h"
 #include <hge/hgeparticle.h>

projects/mtg/src/WResourceManager.cpp

@@ -1,6 +1,5 @@
 #include "PrecompiledHeader.h"
 
-#include "GameOptions.h"
 #include "WResourceManagerImpl.h"
 #include "StyleManager.h"