Moved a few more common shared includes into the precompiled header.

projects/mtg/include/PrecompiledHeader.h

@@ -1,6 +1,8 @@
 #ifndef PRECOMPILEDHEADER_H
 #define PRECOMPILEDHEADER_H
 
+#include <algorithm>
+#include <fstream>
 #include <iostream>
 #include <list>
 #include <map>
@@ -13,4 +15,6 @@
 
 #include <assert.h>
 
+#include "JGE.h"
+
 #endif //PRECOMPILEDHEADER_H

projects/mtg/src/CardPrimitive.cpp

@@ -2,8 +2,6 @@
 
 #include "CardPrimitive.h"
 
-#include <stdlib.h>
-
 #include "MTGDeck.h"
 #include "Subtypes.h"
 #include "Translate.h"

projects/mtg/src/ExtraCost.cpp

@@ -6,7 +6,6 @@
 #include "Translate.h"
 #include "Player.h"
 #include "Counters.h"
-#include <JGE.h>
 
 ExtraCost::ExtraCost(const std::string& inCostRenderString, TargetChooser *_tc)
   : tc(_tc), source(NULL), target(NULL), mCostRenderString(inCostRenderString)

projects/mtg/src/GameOptions.cpp

@@ -7,11 +7,6 @@
 #include "OptionItem.h"
 #include "StyleManager.h"
 
-#include <fstream>
-
-#include <stdlib.h>
-#include <JGE.h>
-
 const string Options::optionNames[] = {
 //Global options
   "Profile",

projects/mtg/src/GameStateDeckViewer.cpp

@@ -6,7 +6,6 @@
 #include "PrecompiledHeader.h"
 
 #include <math.h>
-#include <JGE.h>
 
 #include "DeckManager.h"
 #include "GameStateDuel.h"

projects/mtg/src/GameStateStory.cpp

@@ -5,7 +5,6 @@
 #include "SimpleMenu.h"
 #include "GameApp.h"
 #include <dirent.h>
-#include <fstream>
 
 GameStateStory::GameStateStory(GameApp* parent): GameState(parent) {
 	flow = NULL;

projects/mtg/src/Logger.cpp

@@ -3,7 +3,6 @@
 #include "Logger.h"
 #ifdef DOLOG
 
-#include <fstream>
 using namespace std;
 
 #if defined (WIN32)

projects/mtg/src/MTGCard.cpp

@@ -5,9 +5,6 @@
 
 #include "PrecompiledHeader.h"
 
-#include <string>
-#include <stdlib.h>
-
 #include "MTGDeck.h"
 #include "MTGCard.h"
 #include "CardPrimitive.h"

projects/mtg/src/MTGCardInstance.cpp

@@ -11,7 +11,7 @@
 #include "CardDescriptor.h"
 #include "Counters.h"
 #include "Subtypes.h"
-#include <algorithm>
+
 using namespace std;
 
 MTGCardInstance MTGCardInstance::AnyCard = MTGCardInstance();

projects/mtg/src/MTGDeck.cpp

@@ -1,8 +1,5 @@
 #include "PrecompiledHeader.h"
 
-#include <algorithm>
-#include <sstream>
-
 #include "MTGDeck.h"
 #include "utils.h"
 #include "Subtypes.h"
@@ -13,7 +10,6 @@
 #include "MTGPack.h"
 #include "utils.h"
 
-#include <JGE.h>
 
 #if defined (WIN32) || defined (LINUX)
 #include <time.h>

projects/mtg/src/OptionItem.cpp

@@ -1,15 +1,12 @@
 #include "PrecompiledHeader.h"
 
 #include "OptionItem.h"
-#include <JGE.h>
 #include "PlayerData.h"
 #include "Translate.h"
 #include "Subtypes.h"
 #include "TranslateKeys.h"
 #include "StyleManager.h"
 #include <dirent.h>
-#include <stdlib.h>
-#include <algorithm>
 
 //OptionItem
 OptionItem::OptionItem( int _id,  string _displayValue): WGuiItem(_displayValue) {

projects/mtg/src/StoryFlow.cpp

@@ -9,7 +9,6 @@
 #include "PlayerData.h"
 #include "MTGDeck.h"
 #include "WFont.h"
-#include <JGE.h>
 #include <JFileSystem.h>
 
 

projects/mtg/src/Subtypes.cpp

@@ -1,8 +1,6 @@
 #include "PrecompiledHeader.h"
 
 #include "Subtypes.h"
-#include <JGE.h>
-#include <algorithm>
 
 Subtypes * Subtypes::subtypesList = NEW Subtypes();
 

projects/mtg/src/Translate.cpp

@@ -2,8 +2,6 @@
 
 #include "Translate.h"
 #include "GameOptions.h"
-#include <JGE.h>
-#include <fstream>
 
 Translator *  Translator::mInstance = NULL;
 

projects/mtg/src/WCachedResource.cpp

@@ -1,9 +1,6 @@
 #include "PrecompiledHeader.h"
 
 #include "utils.h"
-#include <fstream>
-#include <stdlib.h>
-#include <JGE.h>
 #include <JFileSystem.h>
 #include "GameOptions.h"
 #include "WResourceManager.h"

projects/mtg/src/WDataSrc.cpp

@@ -5,7 +5,6 @@
 #include "Translate.h"
 #include "PriceList.h"
 #include "Subtypes.h"
-#include <algorithm>
 
 //WSyncable
 bool WSyncable::Hook(WSyncable* s){

projects/mtg/src/WFilter.cpp

@@ -3,8 +3,6 @@
 #include "OptionItem.h"
 #include "PlayerData.h"
 #include "Translate.h"
-#include <algorithm>
-
 
 //WCFilterFactory
 WCFilterFactory* WCFilterFactory::me = NULL;

projects/mtg/src/WGui.cpp

@@ -5,8 +5,6 @@
 #include "Translate.h"
 #include "Subtypes.h"
 #include "TranslateKeys.h"
-#include <sstream>
-#include <algorithm>
 #include <hge/hgedistort.h>
 
 //WGuiBase

projects/mtg/src/WResourceManager.cpp

@@ -1,8 +1,5 @@
 #include "PrecompiledHeader.h"
 
-#include <fstream>
-#include <stdlib.h>
-#include <JGE.h>
 #include <JFileSystem.h>
 
 #include "utils.h"