diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile index 7238d2389..6438e7b58 100644 --- a/projects/mtg/Makefile +++ b/projects/mtg/Makefile @@ -1,4 +1,4 @@ -OBJS = objs/ActionElement.o objs/ActionLayer.o objs/ActionStack.o objs/AIMomirPlayer.o objs/AIPlayer.o objs/AIStats.o objs/CardGui.o objs/CardDescriptor.o objs/CardDisplay.o objs/CardEffect.o objs/CardPrimitive.o objs/CardSelector.o objs/Counters.o objs/Credits.o objs/Damage.o objs/DamagerDamaged.o objs/DeckDataWrapper.o objs/DeckMetaData.o objs/DeckStats.o objs/DuelLayers.o objs/Effects.o objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o objs/GameObserver.o objs/GameOptions.o objs/GameState.o objs/GameStateAwards.o objs/GameStateDeckViewer.o objs/GameStateDuel.o objs/DeckManager.o objs/GameStateMenu.o objs/GameStateOptions.o objs/GameStateShop.o objs/GameStateStory.o objs/GameStateTransitions.o objs/GuiAvatars.o objs/GuiBackground.o objs/GuiCardsController.o objs/GuiCombat.o objs/GuiFrame.o objs/GuiHand.o objs/GuiLayers.o objs/GuiMana.o objs/GuiPhaseBar.o objs/GuiPlay.o objs/GuiStatic.o objs/Logger.o objs/ManaCost.o objs/ManaCostHybrid.o objs/MenuItem.o objs/MTGAbility.o objs/MTGCardInstance.o objs/MTGCard.o objs/MTGDeck.o objs/MTGDefinitions.o objs/MTGGamePhase.o objs/MTGGameZones.o objs/MTGPack.o objs/MTGRules.o objs/OptionItem.o objs/PhaseRing.o objs/Player.o objs/PlayerData.o objs/PlayGuiObjectController.o objs/PlayGuiObject.o objs/Pos.o objs/PriceList.o objs/ReplacementEffects.o objs/Rules.o objs/SimpleMenu.o objs/SimpleMenuItem.o objs/SimplePad.o objs/StoryFlow.o objs/StyleManager.o objs/Subtypes.o objs/TargetChooser.o objs/TargetsList.o objs/TextScroller.o objs/ThisDescriptor.o objs/Token.o objs/Translate.o objs/TranslateKeys.o objs/Trash.o objs/utils.o objs/WEvent.o objs/WResourceManager.o objs/WCachedResource.o objs/WDataSrc.o objs/WGui.o objs/WFilter.o objs/Tasks.o objs/WFont.o +OBJS = objs/ActionElement.o objs/ActionLayer.o objs/ActionStack.o objs/AIMomirPlayer.o objs/AIPlayer.o objs/AIStats.o objs/CardGui.o objs/CardDescriptor.o objs/CardDisplay.o objs/CardEffect.o objs/CardPrimitive.o objs/CardSelector.o objs/Counters.o objs/Credits.o objs/Damage.o objs/DamagerDamaged.o objs/DeckDataWrapper.o objs/DeckMetaData.o objs/DeckStats.o objs/DuelLayers.o objs/Effects.o objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o objs/GameObserver.o objs/GameOptions.o objs/GameState.o objs/GameStateAwards.o objs/GameStateDeckViewer.o objs/GameStateDuel.o objs/DeckManager.o objs/GameStateMenu.o objs/GameStateOptions.o objs/GameStateShop.o objs/GameStateStory.o objs/GameStateTransitions.o objs/GuiAvatars.o objs/GuiBackground.o objs/GuiCardsController.o objs/GuiCombat.o objs/GuiFrame.o objs/GuiHand.o objs/GuiLayers.o objs/GuiMana.o objs/GuiPhaseBar.o objs/GuiPlay.o objs/GuiStatic.o objs/Logger.o objs/ManaCost.o objs/ManaCostHybrid.o objs/MenuItem.o objs/MTGAbility.o objs/MTGCardInstance.o objs/MTGCard.o objs/MTGDeck.o objs/MTGDefinitions.o objs/MTGGamePhase.o objs/MTGGameZones.o objs/MTGPack.o objs/MTGRules.o objs/OptionItem.o objs/PhaseRing.o objs/Player.o objs/PlayerData.o objs/PlayGuiObjectController.o objs/PlayGuiObject.o objs/Pos.o objs/PrecompiledHeader.o objs/PriceList.o objs/ReplacementEffects.o objs/Rules.o objs/SimpleMenu.o objs/SimpleMenuItem.o objs/SimplePad.o objs/StoryFlow.o objs/StyleManager.o objs/Subtypes.o objs/TargetChooser.o objs/TargetsList.o objs/TextScroller.o objs/ThisDescriptor.o objs/Token.o objs/Translate.o objs/TranslateKeys.o objs/Trash.o objs/utils.o objs/WEvent.o objs/WResourceManager.o objs/WCachedResource.o objs/WDataSrc.o objs/WGui.o objs/WFilter.o objs/Tasks.o objs/WFont.o DEPS = $(patsubst objs/%.o, deps/%.d, $(OBJS)) RESULT = $(shell psp-config --psp-prefix 2> Makefile.cache) @@ -34,18 +34,17 @@ PSP_EBOOT_ICON = icon.png #PSP_EBOOT_ICON1 = icon1.pmf PSP_EBOOT_UNKPNG = pic0.png PSP_EBOOT_PIC1 = pic1.png -CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -INCDIR = ../../JGE/include ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src +INCDIR = ../../JGE/include ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src ../../projects/mtg/include LIBDIR = ../../JGE/lib/psp +CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1 else OBJS += objs/TestSuiteAI.o -INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include +INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include ../../projects/mtg/include LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 $(FMOD) -CFLAGS = $(INCDIR) -DLINUX +CFLAGS = -O2 -DLINUX -DUSE_PRECOMPILED_HEADERS=1 ASFLAGS = $(CXXFLAGS) -all: CFLAGS += -O2 all: $(DEFAULT_RULE) endif @@ -90,8 +89,11 @@ clean: endif -$(OBJS): objs/%.o: src/%.cpp - $(CXX) -c -o $@ $(CXXFLAGS) $< +PrecompiledHeader.h.gch: ../../projects/mtg/include/PrecompiledHeader.h + $(CXX) -c $(CXXFLAGS) $< + +$(OBJS): objs/%.o: src/%.cpp PrecompiledHeader.h.gch + $(CXX) -c $(CXXFLAGS) $< -o $@ $(DEPS): deps/%.d: src/%.cpp @$(CXX) -MM $(CXXFLAGS) -MQ $(patsubst deps/%.d, objs/%.o, $(@)) -MQ $@ $< > $@ diff --git a/projects/mtg/include/ActionStack.h b/projects/mtg/include/ActionStack.h index 7cebf72a8..14d7ebb53 100644 --- a/projects/mtg/include/ActionStack.h +++ b/projects/mtg/include/ActionStack.h @@ -22,10 +22,10 @@ #define RESOLVED_OK 1 #define RESOLVED_NOK -1 -#include "../include/PlayGuiObject.h" +#include "PlayGuiObject.h" #include "GuiLayers.h" -#include "../include/TargetsList.h" -#include "../include/Targetable.h" +#include "TargetsList.h" +#include "Targetable.h" class GuiLayer; class PlayGuiObject; diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index f36078bae..6420d2f76 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -1,7 +1,7 @@ #ifndef _CARDS_H_ #define _CARDS_H_ -#include "../include/DebugRoutines.h" +#include "DebugRoutines.h" #include "MTGAbility.h" #include "ManaCost.h" #include "CardDescriptor.h" diff --git a/projects/mtg/include/CardDisplay.h b/projects/mtg/include/CardDisplay.h index ff9108b78..8faba4c8b 100644 --- a/projects/mtg/include/CardDisplay.h +++ b/projects/mtg/include/CardDisplay.h @@ -1,7 +1,7 @@ #ifndef _CARD_DISPLAY_H_ #define _CARD_DISPLAY_H_ -#include "../include/PlayGuiObjectController.h" +#include "PlayGuiObjectController.h" class TargetChooser; class MTGGameZone; diff --git a/projects/mtg/include/Credits.h b/projects/mtg/include/Credits.h index a552e0556..2da684670 100644 --- a/projects/mtg/include/Credits.h +++ b/projects/mtg/include/Credits.h @@ -5,9 +5,9 @@ #include #include #include -#include "../include/WFont.h" +#include "WFont.h" #include -#include "../include/Player.h" +#include "Player.h" class GameApp; diff --git a/projects/mtg/include/DebugRoutines.h b/projects/mtg/include/DebugRoutines.h index 6fd19c3f6..667865a55 100644 --- a/projects/mtg/include/DebugRoutines.h +++ b/projects/mtg/include/DebugRoutines.h @@ -4,7 +4,7 @@ // dirty, but I get OS header includes this way #include "JGE.h" -#include "../include/config.h" +#include "config.h" #include #include diff --git a/projects/mtg/include/DeckDataWrapper.h b/projects/mtg/include/DeckDataWrapper.h index 6d84da208..7ebde8316 100644 --- a/projects/mtg/include/DeckDataWrapper.h +++ b/projects/mtg/include/DeckDataWrapper.h @@ -1,10 +1,10 @@ #ifndef _DECKDATAWRAPPER_H_ #define _DECKDATAWRAPPER_H_ -#include "../include/MTGDefinitions.h" -#include "../include/MTGCard.h" -#include "../include/CardPrimitive.h" -#include "../include/WDataSrc.h" +#include "MTGDefinitions.h" +#include "MTGCard.h" +#include "CardPrimitive.h" +#include "WDataSrc.h" #include #include using std::map; diff --git a/projects/mtg/include/DeckMetaData.h b/projects/mtg/include/DeckMetaData.h index d583afd23..6101d0243 100644 --- a/projects/mtg/include/DeckMetaData.h +++ b/projects/mtg/include/DeckMetaData.h @@ -4,7 +4,7 @@ #include #include #include -#include "../include/DeckStats.h" +#include "DeckStats.h" using namespace std; diff --git a/projects/mtg/include/GameApp.h b/projects/mtg/include/GameApp.h index ed8ba42fc..600fcbad4 100644 --- a/projects/mtg/include/GameApp.h +++ b/projects/mtg/include/GameApp.h @@ -12,7 +12,7 @@ #define _GAMEAPP_H_ -#include "../include/Logger.h" +#include "Logger.h" #include @@ -20,16 +20,16 @@ #include #include #include -#include "../include/WResourceManager.h" +#include "WResourceManager.h" -#include "../include/GameState.h" -#include "../include/GameOptions.h" +#include "GameState.h" +#include "GameOptions.h" -#include "../include/MTGDeck.h" -#include "../include/MTGCard.h" -#include "../include/MTGGameZones.h" +#include "MTGDeck.h" +#include "MTGCard.h" +#include "MTGGameZones.h" -#include "../include/CardEffect.h" +#include "CardEffect.h" #define PLAYER_TYPE_CPU 0 #define PLAYER_TYPE_HUMAN 1 diff --git a/projects/mtg/include/GameOptions.h b/projects/mtg/include/GameOptions.h index 181c6bb66..39306422b 100644 --- a/projects/mtg/include/GameOptions.h +++ b/projects/mtg/include/GameOptions.h @@ -7,8 +7,8 @@ using std::map; using std::string; #include #include -#include "../include/SimplePad.h" -#include "../include/GameApp.h" +#include "SimplePad.h" +#include "GameApp.h" #define GLOBAL_SETTINGS RESPATH"/settings/options.txt" #define PLAYER_SAVEFILE "data.dat" diff --git a/projects/mtg/include/GameState.h b/projects/mtg/include/GameState.h index 7be49eea5..e312b4eaa 100644 --- a/projects/mtg/include/GameState.h +++ b/projects/mtg/include/GameState.h @@ -9,7 +9,7 @@ class JGE; #include #include #include -#include "../include/DeckMetaData.h" +#include "DeckMetaData.h" using namespace std; diff --git a/projects/mtg/include/GameStateAwards.h b/projects/mtg/include/GameStateAwards.h index a0e619e0e..136d2273b 100644 --- a/projects/mtg/include/GameStateAwards.h +++ b/projects/mtg/include/GameStateAwards.h @@ -2,8 +2,8 @@ #define _GAME_STATE_AWARDS_H_ #include -#include "../include/GameState.h" -#include "../include/SimpleMenu.h" +#include "GameState.h" +#include "SimpleMenu.h" class WGuiList; class WGuiMenu; diff --git a/projects/mtg/include/GameStateDeckViewer.h b/projects/mtg/include/GameStateDeckViewer.h index 2c8ecb610..c08e449ce 100644 --- a/projects/mtg/include/GameStateDeckViewer.h +++ b/projects/mtg/include/GameStateDeckViewer.h @@ -6,17 +6,17 @@ #include -#include "../include/GameState.h" -#include "../include/SimpleMenu.h" -#include "../include/WResourceManager.h" -#include "../include/CardGui.h" -#include "../include/GameOptions.h" -#include "../include/PriceList.h" -#include "../include/PlayerData.h" -#include "../include/DeckDataWrapper.h" -#include "../include/DeckStats.h" -#include "../include/WDataSrc.h" -#include "../include/WGui.h" +#include "GameState.h" +#include "SimpleMenu.h" +#include "WResourceManager.h" +#include "CardGui.h" +#include "GameOptions.h" +#include "PriceList.h" +#include "PlayerData.h" +#include "DeckDataWrapper.h" +#include "DeckStats.h" +#include "WDataSrc.h" +#include "WGui.h" #define NO_USER_ACTIVITY_HELP_DELAY 10 #define NO_USER_ACTIVITY_SHOWCARD_DELAY 0.1 diff --git a/projects/mtg/include/GameStateDuel.h b/projects/mtg/include/GameStateDuel.h index 7559b2cee..4954fd514 100644 --- a/projects/mtg/include/GameStateDuel.h +++ b/projects/mtg/include/GameStateDuel.h @@ -2,10 +2,10 @@ #define _GAME_STATE_DUEL_H_ -#include "../include/GameState.h" -#include "../include/SimpleMenu.h" -#include "../include/MTGDeck.h" -#include "../include/GameObserver.h" +#include "GameState.h" +#include "SimpleMenu.h" +#include "MTGDeck.h" +#include "GameObserver.h" #define CHOOSE_OPPONENT 7 diff --git a/projects/mtg/include/GameStateMenu.h b/projects/mtg/include/GameStateMenu.h index c11767497..e13fd18db 100644 --- a/projects/mtg/include/GameStateMenu.h +++ b/projects/mtg/include/GameStateMenu.h @@ -3,9 +3,9 @@ #include #include -#include "../include/GameState.h" -#include "../include/SimpleMenu.h" -#include "../include/TextScroller.h" +#include "GameState.h" +#include "SimpleMenu.h" +#include "TextScroller.h" class GameStateMenu: public GameState, public JGuiListener { diff --git a/projects/mtg/include/GameStateOptions.h b/projects/mtg/include/GameStateOptions.h index ff7ed1da0..3193db802 100644 --- a/projects/mtg/include/GameStateOptions.h +++ b/projects/mtg/include/GameStateOptions.h @@ -3,7 +3,7 @@ #include #include -#include "../include/GameState.h" +#include "GameState.h" class GameApp; class WGuiTabMenu; diff --git a/projects/mtg/include/GameStateShop.h b/projects/mtg/include/GameStateShop.h index f274946f9..8ad3c4f98 100644 --- a/projects/mtg/include/GameStateShop.h +++ b/projects/mtg/include/GameStateShop.h @@ -2,14 +2,14 @@ #define _GAME_STATE_SHOP_H_ #include -#include "../include/GameState.h" -#include "../include/SimpleMenu.h" -#include "../include/OptionItem.h" -#include "../include/PriceList.h" -#include "../include/PlayerData.h" -#include "../include/CardDisplay.h" -#include "../include/DeckDataWrapper.h" -#include "../include/Tasks.h" +#include "GameState.h" +#include "SimpleMenu.h" +#include "OptionItem.h" +#include "PriceList.h" +#include "PlayerData.h" +#include "CardDisplay.h" +#include "DeckDataWrapper.h" +#include "Tasks.h" #define STATE_BUY 1 diff --git a/projects/mtg/include/GameStateStory.h b/projects/mtg/include/GameStateStory.h index 02453f222..164ecfdc3 100644 --- a/projects/mtg/include/GameStateStory.h +++ b/projects/mtg/include/GameStateStory.h @@ -2,7 +2,7 @@ #define _GAME_STATE_STORY_H_ -#include "../include/GameState.h" +#include "GameState.h" #include class StoryFlow; diff --git a/projects/mtg/include/GameStateTransitions.h b/projects/mtg/include/GameStateTransitions.h index aa9ed83eb..f3f0fb30e 100644 --- a/projects/mtg/include/GameStateTransitions.h +++ b/projects/mtg/include/GameStateTransitions.h @@ -3,7 +3,7 @@ #include #include -#include "../include/GameState.h" +#include "GameState.h" class TransitionBase: public GameState, public JGuiListener{ public: diff --git a/projects/mtg/include/GuiLayers.h b/projects/mtg/include/GuiLayers.h index aa29a9d0a..1727d7c70 100644 --- a/projects/mtg/include/GuiLayers.h +++ b/projects/mtg/include/GuiLayers.h @@ -7,7 +7,7 @@ #define DIR_RIGHT 4 #include -#include "../include/WEvent.h" +#include "WEvent.h" class GameObserver; class Player; diff --git a/projects/mtg/include/GuiMana.h b/projects/mtg/include/GuiMana.h index f28f20842..c636def71 100644 --- a/projects/mtg/include/GuiMana.h +++ b/projects/mtg/include/GuiMana.h @@ -1,7 +1,6 @@ #include "string.h" #include #include -#include "config.h" #include "JGE.h" #include "MTGDefinitions.h" #include "GameApp.h" diff --git a/projects/mtg/include/MTGAbility.h b/projects/mtg/include/MTGAbility.h index d879b1d5c..40739b6ae 100644 --- a/projects/mtg/include/MTGAbility.h +++ b/projects/mtg/include/MTGAbility.h @@ -14,13 +14,13 @@ class AManaProducer; class WEvent; class Counter; -#include "../include/GameObserver.h" +#include "GameObserver.h" #include "ActionElement.h" #include #include #include -#include "../include/Damage.h" -#include "../include/TargetChooser.h" +#include "Damage.h" +#include "TargetChooser.h" using std::string; using std::map; diff --git a/projects/mtg/include/MTGDeck.h b/projects/mtg/include/MTGDeck.h index 2b5dd8852..27293a77e 100644 --- a/projects/mtg/include/MTGDeck.h +++ b/projects/mtg/include/MTGDeck.h @@ -3,9 +3,9 @@ #define MTG_ERROR -1 -#include "../include/MTGDefinitions.h" -#include "../include/GameApp.h" -#include "../include/WResourceManager.h" +#include "MTGDefinitions.h" +#include "GameApp.h" +#include "WResourceManager.h" #include diff --git a/projects/mtg/include/MTGGamePhase.h b/projects/mtg/include/MTGGamePhase.h index bc9dfe6a7..989223c67 100644 --- a/projects/mtg/include/MTGGamePhase.h +++ b/projects/mtg/include/MTGGamePhase.h @@ -5,7 +5,7 @@ #include "GameObserver.h" #include -#include "../include/WFont.h" +#include "WFont.h" class MTGGamePhase: public ActionElement { diff --git a/projects/mtg/include/MTGRules.h b/projects/mtg/include/MTGRules.h index 589b1898e..979141c80 100644 --- a/projects/mtg/include/MTGRules.h +++ b/projects/mtg/include/MTGRules.h @@ -4,10 +4,10 @@ #ifndef _MTGRULES_H_ #define _MTGRULES_H_ -#include "../include/MTGAbility.h" -#include "../include/Counters.h" -#include "../include/WEvent.h" -#include "../include/CardSelector.h" +#include "MTGAbility.h" +#include "Counters.h" +#include "WEvent.h" +#include "CardSelector.h" class OtherAbilitiesEventReceiver:public MTGAbility{ public: diff --git a/projects/mtg/include/ManaCost.h b/projects/mtg/include/ManaCost.h index bd6728429..3cf76e4f6 100644 --- a/projects/mtg/include/ManaCost.h +++ b/projects/mtg/include/ManaCost.h @@ -1,8 +1,8 @@ #ifndef _MANACOST_H_ #define _MANACOST_H_ -#include "../include/utils.h" -#include "../include/MTGDefinitions.h" +#include "utils.h" +#include "MTGDefinitions.h" class ManaCostHybrid; diff --git a/projects/mtg/include/MenuItem.h b/projects/mtg/include/MenuItem.h index 24f1a6565..74f8dfd07 100644 --- a/projects/mtg/include/MenuItem.h +++ b/projects/mtg/include/MenuItem.h @@ -1,7 +1,7 @@ #ifndef _MENU_ITEM_H #define _MENU_ITEM_H -#include "../include/WFont.h" +#include "WFont.h" #include #include #include diff --git a/projects/mtg/include/OptionItem.h b/projects/mtg/include/OptionItem.h index 584b8cb51..5d5781e8f 100644 --- a/projects/mtg/include/OptionItem.h +++ b/projects/mtg/include/OptionItem.h @@ -4,12 +4,12 @@ #include #include #include -#include "../include/GameApp.h" -#include "../include/GameStateOptions.h" -#include "../include/GameOptions.h" -#include "../include/WFilter.h" -#include "../include/WDataSrc.h" -#include "../include/WGui.h" +#include "GameApp.h" +#include "GameStateOptions.h" +#include "GameOptions.h" +#include "WFilter.h" +#include "WDataSrc.h" +#include "WGui.h" using std::string; diff --git a/projects/mtg/include/PlayerData.h b/projects/mtg/include/PlayerData.h index 71605bb2a..55c00ffba 100644 --- a/projects/mtg/include/PlayerData.h +++ b/projects/mtg/include/PlayerData.h @@ -1,8 +1,8 @@ #ifndef _PLAYER_DATA_H_ #define _PLAYER_DATA_H_ -#include "../include/MTGDeck.h" -#include "../include/Tasks.h" +#include "MTGDeck.h" +#include "Tasks.h" class PlayerData{ protected: diff --git a/projects/mtg/include/PrecompiledHeader.h b/projects/mtg/include/PrecompiledHeader.h new file mode 100644 index 000000000..c50178d7a --- /dev/null +++ b/projects/mtg/include/PrecompiledHeader.h @@ -0,0 +1,16 @@ +#ifndef PRECOMPILEDHEADER_H +#define PRECOMPILEDHEADER_H + +#include +#include +#include +#include +#include +#include + +#include "config.h" +#include "DebugRoutines.h" + +#include + +#endif //PRECOMPILEDHEADER_H \ No newline at end of file diff --git a/projects/mtg/include/PriceList.h b/projects/mtg/include/PriceList.h index e31f2f025..82209a351 100644 --- a/projects/mtg/include/PriceList.h +++ b/projects/mtg/include/PriceList.h @@ -2,8 +2,8 @@ #define _PRICELIST_H_ #include -#include "../include/MTGDefinitions.h" -#include "../include/MTGDeck.h" +#include "MTGDefinitions.h" +#include "MTGDeck.h" #include class MTGAllCards; diff --git a/projects/mtg/include/ReplacementEffects.h b/projects/mtg/include/ReplacementEffects.h index 873da7428..87723f29a 100644 --- a/projects/mtg/include/ReplacementEffects.h +++ b/projects/mtg/include/ReplacementEffects.h @@ -3,7 +3,7 @@ #include using namespace std; -#include "../include/Damage.h" +#include "Damage.h" #include "WEvent.h" class TargetChooser; diff --git a/projects/mtg/include/SimpleMenu.h b/projects/mtg/include/SimpleMenu.h index 4ef41238e..20d70f200 100644 --- a/projects/mtg/include/SimpleMenu.h +++ b/projects/mtg/include/SimpleMenu.h @@ -6,7 +6,7 @@ #include #include -#include "../include/WFont.h" +#include "WFont.h" #include "hge/hgeparticle.h" class SimpleMenu:public JGuiController{ diff --git a/projects/mtg/include/SimpleMenuItem.h b/projects/mtg/include/SimpleMenuItem.h index abc9bda50..6a5ff2cc2 100644 --- a/projects/mtg/include/SimpleMenuItem.h +++ b/projects/mtg/include/SimpleMenuItem.h @@ -4,7 +4,6 @@ #include #include #include -#include #include "SimpleMenu.h" using std::string; diff --git a/projects/mtg/include/TargetChooser.h b/projects/mtg/include/TargetChooser.h index a3f47d99c..3d92b0f44 100644 --- a/projects/mtg/include/TargetChooser.h +++ b/projects/mtg/include/TargetChooser.h @@ -7,8 +7,8 @@ #define TARGET_OK_NOT_READY 3 #include -#include "../include/TargetsList.h" -#include "../include/ActionStack.h" +#include "TargetsList.h" +#include "ActionStack.h" #include using std::string; diff --git a/projects/mtg/include/TestSuiteAI.h b/projects/mtg/include/TestSuiteAI.h index cb4f1d61d..24f87c0a3 100644 --- a/projects/mtg/include/TestSuiteAI.h +++ b/projects/mtg/include/TestSuiteAI.h @@ -4,7 +4,7 @@ #define MAX_TESTSUITE_ACTIONS 100 #define MAX_TESTUITE_CARDS 100 -#include "../include/AIPlayer.h" +#include "AIPlayer.h" class TestSuiteActions{ public: diff --git a/projects/mtg/src/AIMomirPlayer.cpp b/projects/mtg/src/AIMomirPlayer.cpp index 61f1252f5..0e4c949e8 100644 --- a/projects/mtg/src/AIMomirPlayer.cpp +++ b/projects/mtg/src/AIMomirPlayer.cpp @@ -1,9 +1,10 @@ -#include "../include/config.h" -#include "../include/AIMomirPlayer.h" -#include "../include/CardDescriptor.h" -#include "../include/DamagerDamaged.h" -#include "../include/AIStats.h" -#include "../include/AllAbilities.h" +#include "PrecompiledHeader.h" + +#include "AIMomirPlayer.h" +#include "CardDescriptor.h" +#include "DamagerDamaged.h" +#include "AIStats.h" +#include "AllAbilities.h" MTGAbility * AIMomirPlayer::momirAbility = NULL; diff --git a/projects/mtg/src/AIPlayer.cpp b/projects/mtg/src/AIPlayer.cpp index 165c58acd..899d41fd4 100644 --- a/projects/mtg/src/AIPlayer.cpp +++ b/projects/mtg/src/AIPlayer.cpp @@ -1,12 +1,12 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/AIPlayer.h" -#include "../include/CardDescriptor.h" -#include "../include/AIStats.h" -#include "../include/AllAbilities.h" -#include "../include/ExtraCost.h" -#include "../include/GuiCombat.h" -#include "../include/GameStateDuel.h" +#include "PrecompiledHeader.h" + +#include "AIPlayer.h" +#include "CardDescriptor.h" +#include "AIStats.h" +#include "AllAbilities.h" +#include "ExtraCost.h" +#include "GuiCombat.h" +#include "GameStateDuel.h" const char * const MTG_LAND_TEXTS[] = {"artifact","forest","island","mountain","swamp","plains","other lands"}; diff --git a/projects/mtg/src/AIStats.cpp b/projects/mtg/src/AIStats.cpp index 91d720216..bfbf5213e 100644 --- a/projects/mtg/src/AIStats.cpp +++ b/projects/mtg/src/AIStats.cpp @@ -1,10 +1,11 @@ -#include "../include/config.h" -#include "../include/AIStats.h" -#include "../include/GameObserver.h" -#include "../include/Player.h" -#include "../include/MTGCardInstance.h" -#include "../include/WEvent.h" -#include "../include/AllAbilities.h" +#include "PrecompiledHeader.h" + +#include "AIStats.h" +#include "GameObserver.h" +#include "Player.h" +#include "MTGCardInstance.h" +#include "WEvent.h" +#include "AllAbilities.h" //TODO:better comments this is too cryptic to work on by anyone but original coder. bool compare_aistats(AIStat * first, AIStat * second){ float damage1 = first->value / first->occurences; diff --git a/projects/mtg/src/ActionElement.cpp b/projects/mtg/src/ActionElement.cpp index 146fd107d..3f2ca33f9 100644 --- a/projects/mtg/src/ActionElement.cpp +++ b/projects/mtg/src/ActionElement.cpp @@ -1,7 +1,9 @@ -#include "../include/ActionElement.h" -#include "../include/MTGCardInstance.h" -#include "../include/Targetable.h" -#include "../include/TargetChooser.h" +#include "PrecompiledHeader.h" + +#include "ActionElement.h" +#include "MTGCardInstance.h" +#include "Targetable.h" +#include "TargetChooser.h" ActionElement::ActionElement(int id):JGuiObject(id){ activeState = INACTIVE; diff --git a/projects/mtg/src/ActionLayer.cpp b/projects/mtg/src/ActionLayer.cpp index 210960e65..d9cd1f4af 100644 --- a/projects/mtg/src/ActionLayer.cpp +++ b/projects/mtg/src/ActionLayer.cpp @@ -1,10 +1,9 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/ActionLayer.h" -#include "../include/GameObserver.h" -#include "../include/Targetable.h" -#include "../include/WEvent.h" -#include +#include "PrecompiledHeader.h" + +#include "ActionLayer.h" +#include "GameObserver.h" +#include "Targetable.h" +#include "WEvent.h" MTGAbility* ActionLayer::getAbility(int type){ for (int i = 1; i < mCount; i++){ diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp index 4adc90954..62a591cf0 100644 --- a/projects/mtg/src/ActionStack.cpp +++ b/projects/mtg/src/ActionStack.cpp @@ -1,18 +1,18 @@ /* The Action Stack contains all information for Game Events that can be interrupted (Interruptible) */ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/ActionStack.h" -#include "../include/MTGAbility.h" -#include "../include/GameObserver.h" -#include "../include/Damage.h" -#include "../include/ManaCost.h" -#include "../include/GameOptions.h" -#include "../include/WResourceManager.h" -#include "../include/TargetChooser.h" -#include "../include/CardGui.h" -#include "../include/Translate.h" +#include "PrecompiledHeader.h" + +#include "ActionStack.h" +#include "MTGAbility.h" +#include "GameObserver.h" +#include "Damage.h" +#include "ManaCost.h" +#include "GameOptions.h" +#include "WResourceManager.h" +#include "TargetChooser.h" +#include "CardGui.h" +#include "Translate.h" #include diff --git a/projects/mtg/src/CardDescriptor.cpp b/projects/mtg/src/CardDescriptor.cpp index d61fd42c6..c752d22d0 100644 --- a/projects/mtg/src/CardDescriptor.cpp +++ b/projects/mtg/src/CardDescriptor.cpp @@ -1,7 +1,8 @@ -#include "../include/config.h" -#include "../include/CardDescriptor.h" -#include "../include/Subtypes.h" -#include "../include/Counters.h" +#include "PrecompiledHeader.h" + +#include "CardDescriptor.h" +#include "Subtypes.h" +#include "Counters.h" CardDescriptor::CardDescriptor(): MTGCardInstance(){ diff --git a/projects/mtg/src/CardDisplay.cpp b/projects/mtg/src/CardDisplay.cpp index 5d0a9fd34..49a3a86af 100644 --- a/projects/mtg/src/CardDisplay.cpp +++ b/projects/mtg/src/CardDisplay.cpp @@ -1,9 +1,10 @@ -#include "../include/config.h" -#include "../include/CardDisplay.h" -#include "../include/CardGui.h" -#include "../include/TargetChooser.h" -#include "../include/MTGGameZones.h" -#include "../include/GameObserver.h" +#include "PrecompiledHeader.h" + +#include "CardDisplay.h" +#include "CardGui.h" +#include "TargetChooser.h" +#include "MTGGameZones.h" +#include "GameObserver.h" CardDisplay::CardDisplay() : mId(0), game(GameObserver::GetInstance()) { tc = NULL; diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index 84a47d869..0737ea486 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -3,18 +3,17 @@ * This class is in charge of rendering Cards on the screen */ +#include "PrecompiledHeader.h" + #include "JGE.h" -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/CardGui.h" -#include "../include/ManaCostHybrid.h" -#include "../include/Subtypes.h" -#include "../include/Translate.h" -#include "../include/MTGDefinitions.h" -#include "../include/GameObserver.h" +#include "CardGui.h" +#include "ManaCostHybrid.h" +#include "Subtypes.h" +#include "Translate.h" +#include "MTGDefinitions.h" +#include "GameObserver.h" #include -#include -#include "../include/Counters.h" +#include "Counters.h" const float CardGui::Width = 28.0; const float CardGui::Height = 40.0; diff --git a/projects/mtg/src/CardPrimitive.cpp b/projects/mtg/src/CardPrimitive.cpp index a980a03a3..f66993a7e 100644 --- a/projects/mtg/src/CardPrimitive.cpp +++ b/projects/mtg/src/CardPrimitive.cpp @@ -1,13 +1,12 @@ -#include "../include/CardPrimitive.h" +#include "PrecompiledHeader.h" +#include "CardPrimitive.h" -#include #include -#include "../include/MTGDeck.h" -#include "../include/config.h" -#include "../include/Subtypes.h" -#include "../include/Translate.h" +#include "MTGDeck.h" +#include "Subtypes.h" +#include "Translate.h" using std::string; diff --git a/projects/mtg/src/CardSelector.cpp b/projects/mtg/src/CardSelector.cpp index cb6ab7d27..014cd25d5 100644 --- a/projects/mtg/src/CardSelector.cpp +++ b/projects/mtg/src/CardSelector.cpp @@ -1,12 +1,11 @@ -#include -#include +#include "PrecompiledHeader.h" -#include "../include/PlayGuiObject.h" -#include "../include/CardGui.h" -#include "../include/CardSelector.h" -#include "../include/GuiHand.h" +#include "PlayGuiObject.h" +#include "CardGui.h" +#include "CardSelector.h" +#include "GuiHand.h" #include "Closest.cpp" -#include "../include/GameObserver.h" +#include "GameObserver.h" using std::cout; diff --git a/projects/mtg/src/Counters.cpp b/projects/mtg/src/Counters.cpp index 9355a74ab..2fe4c15a9 100644 --- a/projects/mtg/src/Counters.cpp +++ b/projects/mtg/src/Counters.cpp @@ -1,6 +1,7 @@ -#include "../include/Counters.h" -#include "../include/config.h" -#include "../include/MTGCardInstance.h" +#include "PrecompiledHeader.h" + +#include "Counters.h" +#include "MTGCardInstance.h" Counter::Counter(MTGCardInstance * _target, int _power, int _toughness){ init(_target,"",_power, _toughness); diff --git a/projects/mtg/src/Credits.cpp b/projects/mtg/src/Credits.cpp index c17e3b55e..4656184f6 100644 --- a/projects/mtg/src/Credits.cpp +++ b/projects/mtg/src/Credits.cpp @@ -1,14 +1,15 @@ -#include "../include/Credits.h" -#include "../include/GameApp.h" -#include "../include/GameOptions.h" -#include "../include/config.h" -#include "../include/PlayerData.h" -#include "../include/DeckStats.h" -#include "../include/Translate.h" -#include "../include/MTGDeck.h" -#include "../include/GameObserver.h" -#include "../include/GameStateShop.h" -#include "../include/PlayerData.h" +#include "PrecompiledHeader.h" + +#include "Credits.h" +#include "GameApp.h" +#include "GameOptions.h" +#include "PlayerData.h" +#include "DeckStats.h" +#include "Translate.h" +#include "MTGDeck.h" +#include "GameObserver.h" +#include "GameStateShop.h" +#include "PlayerData.h" CreditBonus::CreditBonus(int _value, string _text){ value = _value; diff --git a/projects/mtg/src/Damage.cpp b/projects/mtg/src/Damage.cpp index 42d044330..55cf74f5e 100644 --- a/projects/mtg/src/Damage.cpp +++ b/projects/mtg/src/Damage.cpp @@ -1,11 +1,12 @@ -#include "../include/config.h" -#include "../include/Damage.h" -#include "../include/MTGCardInstance.h" -#include "../include/Counters.h" -#include "../include/WEvent.h" -#include "../include/Translate.h" -#include "../include/WResourceManager.h" -#include "../include/GameObserver.h" +#include "PrecompiledHeader.h" + +#include "Damage.h" +#include "MTGCardInstance.h" +#include "Counters.h" +#include "WEvent.h" +#include "Translate.h" +#include "WResourceManager.h" +#include "GameObserver.h" Damage::Damage(MTGCardInstance * source, Damageable * target) { init(source, target, source->getPower(), DAMAGE_OTHER); diff --git a/projects/mtg/src/DamagerDamaged.cpp b/projects/mtg/src/DamagerDamaged.cpp index bc187801a..494b6128e 100644 --- a/projects/mtg/src/DamagerDamaged.cpp +++ b/projects/mtg/src/DamagerDamaged.cpp @@ -1,5 +1,6 @@ -#include "../include/config.h" -#include "../include/DamagerDamaged.h" +#include "PrecompiledHeader.h" + +#include "DamagerDamaged.h" /* Temporary objects that store the damages dealt to/from creatures during the combat phase diff --git a/projects/mtg/src/DeckDataWrapper.cpp b/projects/mtg/src/DeckDataWrapper.cpp index a624eacbc..5e8476e55 100644 --- a/projects/mtg/src/DeckDataWrapper.cpp +++ b/projects/mtg/src/DeckDataWrapper.cpp @@ -1,8 +1,9 @@ -#include "../include/config.h" -#include "../include/DeckDataWrapper.h" -#include "../include/MTGDeck.h" -#include "../include/PriceList.h" -#include "../include/WDataSrc.h" +#include "PrecompiledHeader.h" + +#include "DeckDataWrapper.h" +#include "MTGDeck.h" +#include "PriceList.h" +#include "WDataSrc.h" DeckDataWrapper::DeckDataWrapper(MTGDeck * deck){ parent = deck; diff --git a/projects/mtg/src/DeckManager.cpp b/projects/mtg/src/DeckManager.cpp index 723feb7c7..229748891 100644 --- a/projects/mtg/src/DeckManager.cpp +++ b/projects/mtg/src/DeckManager.cpp @@ -1,4 +1,6 @@ -#include "../include/DeckManager.h" +#include "PrecompiledHeader.h" + +#include "DeckManager.h" #include void DeckManager::updateMetaDataList( vector * refList, bool isAI ) diff --git a/projects/mtg/src/DeckMetaData.cpp b/projects/mtg/src/DeckMetaData.cpp index 9c4086d95..538c76153 100644 --- a/projects/mtg/src/DeckMetaData.cpp +++ b/projects/mtg/src/DeckMetaData.cpp @@ -1,8 +1,9 @@ -#include "../include/DeckMetaData.h" -#include "../include/DeckStats.h" -#include "../include/MTGDeck.h" -#include "../include/config.h" -#include "../include/utils.h" +#include "PrecompiledHeader.h" + +#include "DeckMetaData.h" +#include "DeckStats.h" +#include "MTGDeck.h" +#include "utils.h" //Possible improvements: //Merge this with DeckStats diff --git a/projects/mtg/src/DeckStats.cpp b/projects/mtg/src/DeckStats.cpp index c53c16115..dd126e71a 100644 --- a/projects/mtg/src/DeckStats.cpp +++ b/projects/mtg/src/DeckStats.cpp @@ -1,7 +1,8 @@ -#include "../include/config.h" -#include "../include/DeckStats.h" -#include "../include/Player.h" -#include "../include/GameObserver.h" +#include "PrecompiledHeader.h" + +#include "DeckStats.h" +#include "Player.h" +#include "GameObserver.h" DeckStats * DeckStats::mInstance = NULL; diff --git a/projects/mtg/src/DuelLayers.cpp b/projects/mtg/src/DuelLayers.cpp index d09fae5b6..9445c5eae 100644 --- a/projects/mtg/src/DuelLayers.cpp +++ b/projects/mtg/src/DuelLayers.cpp @@ -1,15 +1,16 @@ -#include "../include/config.h" -#include "../include/MTGRules.h" -#include "../include/GuiCombat.h" -#include "../include/GuiBackground.h" -#include "../include/GuiFrame.h" -#include "../include/GuiPhaseBar.h" -#include "../include/GuiAvatars.h" -#include "../include/GuiHand.h" -#include "../include/GuiPlay.h" -#include "../include/GuiMana.h" -#include "../include/Trash.h" -#include "../include/DuelLayers.h" +#include "PrecompiledHeader.h" + +#include "MTGRules.h" +#include "GuiCombat.h" +#include "GuiBackground.h" +#include "GuiFrame.h" +#include "GuiPhaseBar.h" +#include "GuiAvatars.h" +#include "GuiHand.h" +#include "GuiPlay.h" +#include "GuiMana.h" +#include "Trash.h" +#include "DuelLayers.h" void DuelLayers::init(){ diff --git a/projects/mtg/src/ExtraCost.cpp b/projects/mtg/src/ExtraCost.cpp index 8158719e8..65824e518 100644 --- a/projects/mtg/src/ExtraCost.cpp +++ b/projects/mtg/src/ExtraCost.cpp @@ -1,11 +1,11 @@ -#include "../include/DebugRoutines.h" -#include "../include/ExtraCost.h" -#include "../include/TargetChooser.h" -#include "../include/MTGCardInstance.h" -#include "../include/Translate.h" -#include "../include/config.h" -#include "../include/Player.h" -#include "../include/Counters.h" +#include "PrecompiledHeader.h" + +#include "ExtraCost.h" +#include "TargetChooser.h" +#include "MTGCardInstance.h" +#include "Translate.h" +#include "Player.h" +#include "Counters.h" #include ExtraCost::ExtraCost(const std::string& inCostRenderString, TargetChooser *_tc) diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp index cb065d0e7..0dc8f3d3e 100644 --- a/projects/mtg/src/GameApp.cpp +++ b/projects/mtg/src/GameApp.cpp @@ -1,5 +1,5 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" +#include "PrecompiledHeader.h" + #include #include #if defined (WIN32) || defined (LINUX) @@ -8,21 +8,21 @@ #include #endif -#include "../include/WResourceManager.h" -#include "../include/GameApp.h" -#include "../include/Subtypes.h" -#include "../include/GameStateTransitions.h" -#include "../include/GameStateDeckViewer.h" -#include "../include/GameStateMenu.h" -#include "../include/GameStateDuel.h" -#include "../include/GameStateOptions.h" -#include "../include/GameStateShop.h" -#include "../include/GameStateAwards.h" -#include "../include/GameStateStory.h" -#include "../include/DeckStats.h" -#include "../include/DeckMetaData.h" -#include "../include/Translate.h" -#include "../include/WFilter.h" +#include "WResourceManager.h" +#include "GameApp.h" +#include "Subtypes.h" +#include "GameStateTransitions.h" +#include "GameStateDeckViewer.h" +#include "GameStateMenu.h" +#include "GameStateDuel.h" +#include "GameStateOptions.h" +#include "GameStateShop.h" +#include "GameStateAwards.h" +#include "GameStateStory.h" +#include "DeckStats.h" +#include "DeckMetaData.h" +#include "Translate.h" +#include "WFilter.h" #define DEFAULT_DURATION .25 diff --git a/projects/mtg/src/GameLauncher.cpp b/projects/mtg/src/GameLauncher.cpp index 73e96b775..9fa840245 100644 --- a/projects/mtg/src/GameLauncher.cpp +++ b/projects/mtg/src/GameLauncher.cpp @@ -7,11 +7,11 @@ // Copyright (c) 2007 James Hui (a.k.a. Dr.Watson) // //------------------------------------------------------------------------------------- -#include "../include/config.h" -#include +#include "PrecompiledHeader.h" + #include -#include "../include/GameApp.h" +#include "GameApp.h" static char GameName[] = "Wagic"; diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index fe055fe68..ab2be1402 100644 --- a/projects/mtg/src/GameObserver.cpp +++ b/projects/mtg/src/GameObserver.cpp @@ -1,11 +1,11 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/GameObserver.h" -#include "../include/GameOptions.h" -#include "../include/CardGui.h" -#include "../include/Damage.h" -#include "../include/Rules.h" -#include "../include/ExtraCost.h" +#include "PrecompiledHeader.h" + +#include "GameObserver.h" +#include "GameOptions.h" +#include "CardGui.h" +#include "Damage.h" +#include "Rules.h" +#include "ExtraCost.h" #include diff --git a/projects/mtg/src/GameOptions.cpp b/projects/mtg/src/GameOptions.cpp index f0f465460..f3d20aa1e 100644 --- a/projects/mtg/src/GameOptions.cpp +++ b/projects/mtg/src/GameOptions.cpp @@ -1,14 +1,14 @@ -#include "../include/config.h" -#include "../include/utils.h" -#include "../include/MTGDeck.h" -#include "../include/GameOptions.h" -#include "../include/Translate.h" -#include "../include/OptionItem.h" -#include "../include/StyleManager.h" -#include -#include +#include "PrecompiledHeader.h" + +#include "utils.h" +#include "MTGDeck.h" +#include "GameOptions.h" +#include "Translate.h" +#include "OptionItem.h" +#include "StyleManager.h" + #include -#include + #include #include diff --git a/projects/mtg/src/GameState.cpp b/projects/mtg/src/GameState.cpp index d4fc61286..56cb1467a 100644 --- a/projects/mtg/src/GameState.cpp +++ b/projects/mtg/src/GameState.cpp @@ -1,12 +1,12 @@ -#include "../include/config.h" -#include "../include/Translate.h" -#include "../include/GameState.h" -#include "../include/Player.h" -#include "../include/SimpleMenu.h" -#include "../include/DeckStats.h" -#include "../include/DeckMetaData.h" -#include "../include/Player.h" -#include +#include "PrecompiledHeader.h" + +#include "Translate.h" +#include "GameState.h" +#include "Player.h" +#include "SimpleMenu.h" +#include "DeckStats.h" +#include "DeckMetaData.h" +#include "Player.h" // The purpose of this method is to create a listing of decks to be used for the input menu // by default, the list will be sorted by name diff --git a/projects/mtg/src/GameStateAwards.cpp b/projects/mtg/src/GameStateAwards.cpp index d815d7a88..307c8f3d1 100644 --- a/projects/mtg/src/GameStateAwards.cpp +++ b/projects/mtg/src/GameStateAwards.cpp @@ -1,15 +1,16 @@ /* This is where the player views their awards, etc. */ -#include "../include/config.h" +#include "PrecompiledHeader.h" + #include -#include "../include/GameStateAwards.h" -#include "../include/GameApp.h" -#include "../include/MTGDeck.h" -#include "../include/Translate.h" -#include "../include/OptionItem.h" -#include "../include/GameOptions.h" -#include "../include/DeckDataWrapper.h" +#include "GameStateAwards.h" +#include "GameApp.h" +#include "MTGDeck.h" +#include "Translate.h" +#include "OptionItem.h" +#include "GameOptions.h" +#include "DeckDataWrapper.h" enum ENUM_AWARDS_STATE{ STATE_LISTVIEW, diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp index 7cd08cfeb..061309bb6 100644 --- a/projects/mtg/src/GameStateDeckViewer.cpp +++ b/projects/mtg/src/GameStateDeckViewer.cpp @@ -3,20 +3,19 @@ * Class handling the Deck Editor */ +#include "PrecompiledHeader.h" + #include -#include -#include #include -#include "../include/config.h" -#include "../include/DeckManager.h" -#include "../include/DebugRoutines.h" -#include "../include/GameStateDuel.h" -#include "../include/GameStateDeckViewer.h" -#include "../include/Translate.h" -#include "../include/ManaCostHybrid.h" -#include "../include/MTGCardInstance.h" -#include "../include/WFilter.h" -#include + +#include "DeckManager.h" +#include "GameStateDuel.h" +#include "GameStateDeckViewer.h" +#include "Translate.h" +#include "ManaCostHybrid.h" +#include "MTGCardInstance.h" +#include "WFilter.h" + //!! helper function; this is probably handled somewhere in the code already. diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp index 5d4fd3fb0..eaa229f76 100644 --- a/projects/mtg/src/GameStateDuel.cpp +++ b/projects/mtg/src/GameStateDuel.cpp @@ -1,22 +1,22 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/GameStateDuel.h" -#include "../include/GameOptions.h" -#include "../include/utils.h" -#include "../include/AIPlayer.h" -#include "../include/AIMomirPlayer.h" -#include "../include/PlayerData.h" -#include "../include/DeckStats.h" -#include "../include/DeckManager.h" +#include "PrecompiledHeader.h" -#include "../include/DeckMetaData.h" -#include "../include/MTGRules.h" -#include "../include/Credits.h" -#include "../include/Translate.h" -#include "../include/Rules.h" +#include "GameStateDuel.h" +#include "GameOptions.h" +#include "utils.h" +#include "AIPlayer.h" +#include "AIMomirPlayer.h" +#include "PlayerData.h" +#include "DeckStats.h" +#include "DeckManager.h" + +#include "DeckMetaData.h" +#include "MTGRules.h" +#include "Credits.h" +#include "Translate.h" +#include "Rules.h" #ifdef TESTSUITE -#include "../include/TestSuiteAI.h" +#include "TestSuiteAI.h" #endif #if defined (WIN32) || defined (LINUX) diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index 03dfa52a9..20379c6fa 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -3,19 +3,20 @@ * Main Menu and Loading screen */ +#include "PrecompiledHeader.h" + #include -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/GameStateMenu.h" -#include "../include/MenuItem.h" -#include "../include/GameOptions.h" -#include "../include/GameApp.h" -#include "../include/MTGCard.h" -#include "../include/Translate.h" -#include "../include/DeckStats.h" -#include "../include/PlayerData.h" -#include "../include/utils.h" -#include "../include/WFont.h" + +#include "GameStateMenu.h" +#include "MenuItem.h" +#include "GameOptions.h" +#include "GameApp.h" +#include "MTGCard.h" +#include "Translate.h" +#include "DeckStats.h" +#include "PlayerData.h" +#include "utils.h" +#include "WFont.h" static const char* GAME_VERSION = "WTH?! 0.13.1 - by wololo"; diff --git a/projects/mtg/src/GameStateOptions.cpp b/projects/mtg/src/GameStateOptions.cpp index 649721589..d6d898845 100644 --- a/projects/mtg/src/GameStateOptions.cpp +++ b/projects/mtg/src/GameStateOptions.cpp @@ -1,11 +1,12 @@ -#include "../include/config.h" -#include "../include/GameStateOptions.h" -#include "../include/GameApp.h" -#include "../include/OptionItem.h" -#include "../include/SimpleMenu.h" -#include "../include/SimplePad.h" -#include "../include/GameOptions.h" -#include "../include/Translate.h" +#include "PrecompiledHeader.h" + +#include "GameStateOptions.h" +#include "GameApp.h" +#include "OptionItem.h" +#include "SimpleMenu.h" +#include "SimplePad.h" +#include "GameOptions.h" +#include "Translate.h" GameStateOptions::GameStateOptions(GameApp* parent): GameState(parent), mReload(false), grabber(NULL), optionsMenu(NULL), optionsTabs(NULL) {} GameStateOptions::~GameStateOptions() {} diff --git a/projects/mtg/src/GameStateShop.cpp b/projects/mtg/src/GameStateShop.cpp index 7af71c68d..330b69815 100644 --- a/projects/mtg/src/GameStateShop.cpp +++ b/projects/mtg/src/GameStateShop.cpp @@ -1,15 +1,16 @@ /* The shop is where the player can buy cards, decks... */ -#include "../include/config.h" +#include "PrecompiledHeader.h" + #include -#include "../include/GameStateShop.h" -#include "../include/GameApp.h" -#include "../include/MTGDeck.h" -#include "../include/MTGPack.h" -#include "../include/Translate.h" -#include "../include/GameOptions.h" -#include "../include/TestSuiteAI.h" +#include "GameStateShop.h" +#include "GameApp.h" +#include "MTGDeck.h" +#include "MTGPack.h" +#include "Translate.h" +#include "GameOptions.h" +#include "TestSuiteAI.h" #include diff --git a/projects/mtg/src/GameStateStory.cpp b/projects/mtg/src/GameStateStory.cpp index a2dc35d86..d816df1c5 100644 --- a/projects/mtg/src/GameStateStory.cpp +++ b/projects/mtg/src/GameStateStory.cpp @@ -1,8 +1,9 @@ -#include "../include/GameStateStory.h" -#include "../include/config.h" -#include "../include/StoryFlow.h" -#include "../include/SimpleMenu.h" -#include "../include/GameApp.h" +#include "PrecompiledHeader.h" + +#include "GameStateStory.h" +#include "StoryFlow.h" +#include "SimpleMenu.h" +#include "GameApp.h" #include #include diff --git a/projects/mtg/src/GameStateTransitions.cpp b/projects/mtg/src/GameStateTransitions.cpp index 670df65e4..1df9fd9fd 100644 --- a/projects/mtg/src/GameStateTransitions.cpp +++ b/projects/mtg/src/GameStateTransitions.cpp @@ -1,12 +1,13 @@ -#include "../include/config.h" +#include "PrecompiledHeader.h" + #include #include -#include "../include/GameApp.h" -#include "../include/GameStateTransitions.h" -#include "../include/MTGDeck.h" -#include "../include/Translate.h" -#include "../include/OptionItem.h" -#include "../include/GameOptions.h" +#include "GameApp.h" +#include "GameStateTransitions.h" +#include "MTGDeck.h" +#include "Translate.h" +#include "OptionItem.h" +#include "GameOptions.h" TransitionBase::TransitionBase(GameApp* parent, GameState* _from, GameState* _to, float duration): GameState(parent){ from = _from; diff --git a/projects/mtg/src/GuiAvatars.cpp b/projects/mtg/src/GuiAvatars.cpp index 99f0d8400..2daeb5c46 100644 --- a/projects/mtg/src/GuiAvatars.cpp +++ b/projects/mtg/src/GuiAvatars.cpp @@ -1,7 +1,8 @@ -#include "../include/config.h" -#include "../include/GameApp.h" -#include "../include/GuiAvatars.h" -#include "../include/GameObserver.h" +#include "PrecompiledHeader.h" + +#include "GameApp.h" +#include "GuiAvatars.h" +#include "GameObserver.h" #define LIB_GRAVE_OFFSET 230 diff --git a/projects/mtg/src/GuiBackground.cpp b/projects/mtg/src/GuiBackground.cpp index 0f18d5afb..aadac23f1 100644 --- a/projects/mtg/src/GuiBackground.cpp +++ b/projects/mtg/src/GuiBackground.cpp @@ -1,8 +1,9 @@ -#include "../include/config.h" -#include "../include/GameApp.h" -#include "../include/GuiBackground.h" -#include "../include/GameObserver.h" -#include "../include/Rules.h" +#include "PrecompiledHeader.h" + +#include "GameApp.h" +#include "GuiBackground.h" +#include "GameObserver.h" +#include "Rules.h" GuiBackground::GuiBackground() { diff --git a/projects/mtg/src/GuiCardsController.cpp b/projects/mtg/src/GuiCardsController.cpp index 4550b35d9..72b3150db 100644 --- a/projects/mtg/src/GuiCardsController.cpp +++ b/projects/mtg/src/GuiCardsController.cpp @@ -1,4 +1,5 @@ -#include "../include/config.h" -#include "../include/GuiCardsController.h" +#include "PrecompiledHeader.h" + +#include "GuiCardsController.h" diff --git a/projects/mtg/src/GuiCombat.cpp b/projects/mtg/src/GuiCombat.cpp index 5e7052ccd..eee5c2529 100644 --- a/projects/mtg/src/GuiCombat.cpp +++ b/projects/mtg/src/GuiCombat.cpp @@ -1,10 +1,10 @@ -#include -#include "../include/config.h" -#include "../include/GameApp.h" -#include "../include/GuiCombat.h" -#include "../include/AIPlayer.h" -#include "../include/GameObserver.h" -#include "../include/Trash.h" +#include "PrecompiledHeader.h" + +#include "GameApp.h" +#include "GuiCombat.h" +#include "AIPlayer.h" +#include "GameObserver.h" +#include "Trash.h" #include "Closest.cpp" static const float MARGIN = 70; diff --git a/projects/mtg/src/GuiFrame.cpp b/projects/mtg/src/GuiFrame.cpp index 655bb9590..632266fe3 100644 --- a/projects/mtg/src/GuiFrame.cpp +++ b/projects/mtg/src/GuiFrame.cpp @@ -1,6 +1,7 @@ -#include "../include/config.h" -#include "../include/GameApp.h" -#include "../include/GuiFrame.h" +#include "PrecompiledHeader.h" + +#include "GameApp.h" +#include "GuiFrame.h" GuiFrame::GuiFrame() { diff --git a/projects/mtg/src/GuiHand.cpp b/projects/mtg/src/GuiHand.cpp index a65c40a9f..e3110e28f 100644 --- a/projects/mtg/src/GuiHand.cpp +++ b/projects/mtg/src/GuiHand.cpp @@ -1,8 +1,9 @@ -#include "../include/config.h" -#include "../include/GameApp.h" -#include "../include/Trash.h" -#include "../include/GuiHand.h" -#include "../include/OptionItem.h" +#include "PrecompiledHeader.h" + +#include "GameApp.h" +#include "Trash.h" +#include "GuiHand.h" +#include "OptionItem.h" const float GuiHand::ClosedRowX = 459; const float GuiHand::LeftRowX = 420; diff --git a/projects/mtg/src/GuiLayers.cpp b/projects/mtg/src/GuiLayers.cpp index d4b7c3e04..b27f81ac3 100644 --- a/projects/mtg/src/GuiLayers.cpp +++ b/projects/mtg/src/GuiLayers.cpp @@ -1,6 +1,7 @@ -#include "../include/config.h" -#include "../include/GuiLayers.h" -#include "../include/Player.h" +#include "PrecompiledHeader.h" + +#include "GuiLayers.h" +#include "Player.h" GuiLayer::GuiLayer(){ modal = 0; diff --git a/projects/mtg/src/GuiMana.cpp b/projects/mtg/src/GuiMana.cpp index 232623553..2f7a38c7f 100644 --- a/projects/mtg/src/GuiMana.cpp +++ b/projects/mtg/src/GuiMana.cpp @@ -1,8 +1,8 @@ -#include -#include "../include/GuiMana.h" -#include "../include/OptionItem.h" -#include "../include/Player.h" +#include "PrecompiledHeader.h" +#include "GuiMana.h" +#include "OptionItem.h" +#include "Player.h" using std::cout; using std::endl; diff --git a/projects/mtg/src/GuiPhaseBar.cpp b/projects/mtg/src/GuiPhaseBar.cpp index b59038d7d..16c3b58cd 100644 --- a/projects/mtg/src/GuiPhaseBar.cpp +++ b/projects/mtg/src/GuiPhaseBar.cpp @@ -1,8 +1,9 @@ -#include "../include/config.h" -#include "../include/GameApp.h" -#include "../include/GuiPhaseBar.h" -#include "../include/GameObserver.h" -#include "../include/Translate.h" +#include "PrecompiledHeader.h" + +#include "GameApp.h" +#include "GuiPhaseBar.h" +#include "GameObserver.h" +#include "Translate.h" /* static int colors[] = diff --git a/projects/mtg/src/GuiPlay.cpp b/projects/mtg/src/GuiPlay.cpp index 1f367c9ce..9c6d57237 100644 --- a/projects/mtg/src/GuiPlay.cpp +++ b/projects/mtg/src/GuiPlay.cpp @@ -1,7 +1,8 @@ -#include "../include/config.h" -#include "../include/GameApp.h" -#include "../include/GuiPlay.h" -#include "../include/Trash.h" +#include "PrecompiledHeader.h" + +#include "GameApp.h" +#include "GuiPlay.h" +#include "Trash.h" #define CARD_WIDTH (31) diff --git a/projects/mtg/src/GuiStatic.cpp b/projects/mtg/src/GuiStatic.cpp index 3b3eb55b4..c95e4acb5 100644 --- a/projects/mtg/src/GuiStatic.cpp +++ b/projects/mtg/src/GuiStatic.cpp @@ -1,6 +1,7 @@ -#include "../include/config.h" -#include "../include/Trash.h" -#include "../include/GuiStatic.h" +#include "PrecompiledHeader.h" + +#include "Trash.h" +#include "GuiStatic.h" GuiStatic::GuiStatic(float desiredHeight, float x, float y, bool hasFocus, GuiAvatars* parent) : PlayGuiObject(desiredHeight, x, y, hasFocus), parent(parent) {} void GuiStatic::Entering() diff --git a/projects/mtg/src/Logger.cpp b/projects/mtg/src/Logger.cpp index 02577f3ad..f765c868a 100644 --- a/projects/mtg/src/Logger.cpp +++ b/projects/mtg/src/Logger.cpp @@ -1,9 +1,8 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/Logger.h" +#include "PrecompiledHeader.h" + +#include "Logger.h" #ifdef DOLOG -#include #include using namespace std; diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index be3953fcc..7df350cbe 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1,15 +1,15 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/MTGAbility.h" -#include "../include/ManaCost.h" -#include "../include/MTGGameZones.h" -#include "../include/AllAbilities.h" -#include "../include/Damage.h" -#include "../include/TargetChooser.h" -#include "../include/CardGui.h" -#include "../include/MTGDeck.h" -#include "../include/Translate.h" -#include "../include/ThisDescriptor.h" +#include "PrecompiledHeader.h" + +#include "MTGAbility.h" +#include "ManaCost.h" +#include "MTGGameZones.h" +#include "AllAbilities.h" +#include "Damage.h" +#include "TargetChooser.h" +#include "CardGui.h" +#include "MTGDeck.h" +#include "Translate.h" +#include "ThisDescriptor.h" int AbilityFactory::countCards(TargetChooser * tc, Player * player, int option) diff --git a/projects/mtg/src/MTGCard.cpp b/projects/mtg/src/MTGCard.cpp index 31610442f..3858e56b6 100644 --- a/projects/mtg/src/MTGCard.cpp +++ b/projects/mtg/src/MTGCard.cpp @@ -3,15 +3,16 @@ //------------------------------------------------- //TODO Fill BasicAbilities +#include "PrecompiledHeader.h" + #include #include -#include "../include/MTGDeck.h" -#include "../include/config.h" -#include "../include/MTGCard.h" -#include "../include/CardPrimitive.h" -#include "../include/Subtypes.h" -#include "../include/Translate.h" +#include "MTGDeck.h" +#include "MTGCard.h" +#include "CardPrimitive.h" +#include "Subtypes.h" +#include "Translate.h" using std::string; diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index c4c027eae..d95344c61 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -4,11 +4,13 @@ Although there is only one MTGCard of each type, there can be as much Instances of it as needed in the game -------------------------------------------- */ -#include "../include/config.h" -#include "../include/MTGCardInstance.h" -#include "../include/CardDescriptor.h" -#include "../include/Counters.h" -#include "../include/Subtypes.h" + +#include "PrecompiledHeader.h" + +#include "MTGCardInstance.h" +#include "CardDescriptor.h" +#include "Counters.h" +#include "Subtypes.h" #include using namespace std; diff --git a/projects/mtg/src/MTGDeck.cpp b/projects/mtg/src/MTGDeck.cpp index 30f508326..debf51bf7 100644 --- a/projects/mtg/src/MTGDeck.cpp +++ b/projects/mtg/src/MTGDeck.cpp @@ -1,18 +1,17 @@ -#include +#include "PrecompiledHeader.h" + #include -#include #include -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/MTGDeck.h" -#include "../include/utils.h" -#include "../include/Subtypes.h" -#include "../include/Translate.h" -#include "../include/DeckMetaData.h" -#include "../include/PriceList.h" -#include "../include/WDataSrc.h" -#include "../include/MTGPack.h" -#include "../include/utils.h" + +#include "MTGDeck.h" +#include "utils.h" +#include "Subtypes.h" +#include "Translate.h" +#include "DeckMetaData.h" +#include "PriceList.h" +#include "WDataSrc.h" +#include "MTGPack.h" +#include "utils.h" #include diff --git a/projects/mtg/src/MTGDefinitions.cpp b/projects/mtg/src/MTGDefinitions.cpp index 10cec9096..3352b17f7 100644 --- a/projects/mtg/src/MTGDefinitions.cpp +++ b/projects/mtg/src/MTGDefinitions.cpp @@ -1,4 +1,6 @@ -#include "../include/MTGDefinitions.h" +#include "PrecompiledHeader.h" + +#include "MTGDefinitions.h" char Constants::MTGColorChars[] = {'x','g','u','r','b','w','l'}; const char* Constants::MTGColorStrings[] = {"artifact", "green", "blue", "red", "black", "white", "land"}; diff --git a/projects/mtg/src/MTGGamePhase.cpp b/projects/mtg/src/MTGGamePhase.cpp index 36e591fc1..aa79026ba 100644 --- a/projects/mtg/src/MTGGamePhase.cpp +++ b/projects/mtg/src/MTGGamePhase.cpp @@ -1,5 +1,6 @@ -#include "../include/config.h" -#include "../include/MTGGamePhase.h" +#include "PrecompiledHeader.h" + +#include "MTGGamePhase.h" MTGGamePhase::MTGGamePhase(int id):ActionElement(id){ diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp index 9db1c9fa0..6c369aab1 100644 --- a/projects/mtg/src/MTGGameZones.cpp +++ b/projects/mtg/src/MTGGameZones.cpp @@ -1,10 +1,10 @@ -#include "../include/config.h" -#include "../include/MTGGameZones.h" -#include "../include/Player.h" -#include "../include/GameOptions.h" -#include "../include/WEvent.h" -#include "../include/MTGDeck.h" -#include +#include "PrecompiledHeader.h" + +#include "MTGGameZones.h" +#include "Player.h" +#include "GameOptions.h" +#include "WEvent.h" +#include "MTGDeck.h" #if defined (WIN32) || defined (LINUX) #include diff --git a/projects/mtg/src/MTGPack.cpp b/projects/mtg/src/MTGPack.cpp index f343597b2..dd365d4aa 100644 --- a/projects/mtg/src/MTGPack.cpp +++ b/projects/mtg/src/MTGPack.cpp @@ -1,14 +1,14 @@ +#include "PrecompiledHeader.h" + #include -#include -#include #include -#include "../include/config.h" -#include "../include/GameApp.h" -#include "../include/Translate.h" -#include "../include/WDataSrc.h" -#include "../include/WFilter.h" -#include "../include/DeckDataWrapper.h" -#include "../include/MTGPack.h" + +#include "GameApp.h" +#include "Translate.h" +#include "WDataSrc.h" +#include "WFilter.h" +#include "DeckDataWrapper.h" +#include "MTGPack.h" #include "../../../JGE/src/tinyxml/tinyxml.h" MTGPack MTGPacks::defaultBooster; diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp index f7dcf579a..294dd530d 100644 --- a/projects/mtg/src/MTGRules.cpp +++ b/projects/mtg/src/MTGRules.cpp @@ -1,9 +1,9 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/MTGRules.h" -#include "../include/Translate.h" -#include "../include/Subtypes.h" -#include "../include/GameOptions.h" +#include "PrecompiledHeader.h" + +#include "MTGRules.h" +#include "Translate.h" +#include "Subtypes.h" +#include "GameOptions.h" diff --git a/projects/mtg/src/ManaCost.cpp b/projects/mtg/src/ManaCost.cpp index 213106406..93e28b509 100644 --- a/projects/mtg/src/ManaCost.cpp +++ b/projects/mtg/src/ManaCost.cpp @@ -1,13 +1,13 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/ManaCost.h" -#include "../include/ManaCostHybrid.h" -#include "../include/ExtraCost.h" -#include "../include/TargetChooser.h" -#include "../include/Targetable.h" -#include "../include/Player.h" -#include "../include/WEvent.h" -#include "../include/MTGAbility.h" +#include "PrecompiledHeader.h" + +#include "ManaCost.h" +#include "ManaCostHybrid.h" +#include "ExtraCost.h" +#include "TargetChooser.h" +#include "Targetable.h" +#include "Player.h" +#include "WEvent.h" +#include "MTGAbility.h" #if defined (WIN32) diff --git a/projects/mtg/src/ManaCostHybrid.cpp b/projects/mtg/src/ManaCostHybrid.cpp index d674adf4f..fc2221f57 100644 --- a/projects/mtg/src/ManaCostHybrid.cpp +++ b/projects/mtg/src/ManaCostHybrid.cpp @@ -1,4 +1,6 @@ -#include "../include/ManaCostHybrid.h" +#include "PrecompiledHeader.h" + +#include "ManaCostHybrid.h" ManaCostHybrid::ManaCostHybrid(){ init(0,0,0,0); diff --git a/projects/mtg/src/MenuItem.cpp b/projects/mtg/src/MenuItem.cpp index c13732bb3..4a3d3f4b7 100644 --- a/projects/mtg/src/MenuItem.cpp +++ b/projects/mtg/src/MenuItem.cpp @@ -1,7 +1,8 @@ -#include "../include/config.h" -#include "../include/MenuItem.h" -#include "../include/GameOptions.h" -#include "../include/Translate.h" +#include "PrecompiledHeader.h" + +#include "MenuItem.h" +#include "GameOptions.h" +#include "Translate.h" MenuItem::MenuItem(int id, WFont *font, string text, int x, int y, JQuad * _off, JQuad * _on, const char * particle, JQuad * particleTex, bool hasFocus): JGuiObject(id), mFont(font), mX(x), mY(y) { diff --git a/projects/mtg/src/OptionItem.cpp b/projects/mtg/src/OptionItem.cpp index 736514225..482e682cb 100644 --- a/projects/mtg/src/OptionItem.cpp +++ b/projects/mtg/src/OptionItem.cpp @@ -1,11 +1,12 @@ -#include "../include/config.h" -#include "../include/OptionItem.h" +#include "PrecompiledHeader.h" + +#include "OptionItem.h" #include -#include "../include/PlayerData.h" -#include "../include/Translate.h" -#include "../include/Subtypes.h" -#include "../include/TranslateKeys.h" -#include "../include/StyleManager.h" +#include "PlayerData.h" +#include "Translate.h" +#include "Subtypes.h" +#include "TranslateKeys.h" +#include "StyleManager.h" #include #include #include diff --git a/projects/mtg/src/PhaseRing.cpp b/projects/mtg/src/PhaseRing.cpp index 5294780e1..204d7d189 100644 --- a/projects/mtg/src/PhaseRing.cpp +++ b/projects/mtg/src/PhaseRing.cpp @@ -1,9 +1,9 @@ -#include "../include/DebugRoutines.h" -#include "../include/PhaseRing.h" -#include "../include/MTGDefinitions.h" -#include "../include/Player.h" -#include "../include/config.h" -#include "../include/WEvent.h" +#include "PrecompiledHeader.h" + +#include "PhaseRing.h" +#include "MTGDefinitions.h" +#include "Player.h" +#include "WEvent.h" //Parses a string and gives phase numer diff --git a/projects/mtg/src/PlayGuiObject.cpp b/projects/mtg/src/PlayGuiObject.cpp index 167a50a48..e96381723 100644 --- a/projects/mtg/src/PlayGuiObject.cpp +++ b/projects/mtg/src/PlayGuiObject.cpp @@ -1,6 +1,6 @@ -#include -#include "../include/config.h" -#include "../include/PlayGuiObject.h" +#include "PrecompiledHeader.h" + +#include "PlayGuiObject.h" using namespace std; diff --git a/projects/mtg/src/PlayGuiObjectController.cpp b/projects/mtg/src/PlayGuiObjectController.cpp index a0c6cb1d9..c8d91d178 100644 --- a/projects/mtg/src/PlayGuiObjectController.cpp +++ b/projects/mtg/src/PlayGuiObjectController.cpp @@ -1,8 +1,9 @@ -#include "../include/config.h" -#include "../include/PlayGuiObjectController.h" +#include "PrecompiledHeader.h" -#include "../include/PlayGuiObject.h" -#include "../include/GameObserver.h" +#include "PlayGuiObjectController.h" + +#include "PlayGuiObject.h" +#include "GameObserver.h" int PlayGuiObjectController::showBigCards = 1; diff --git a/projects/mtg/src/Player.cpp b/projects/mtg/src/Player.cpp index 66b7b1833..22aa1e1ca 100644 --- a/projects/mtg/src/Player.cpp +++ b/projects/mtg/src/Player.cpp @@ -1,8 +1,9 @@ -#include "../include/config.h" -#include "../include/Player.h" -#include "../include/GameObserver.h" -#include "../include/DeckStats.h" -#include "../include/ManaCost.h" +#include "PrecompiledHeader.h" + +#include "Player.h" +#include "GameObserver.h" +#include "DeckStats.h" +#include "ManaCost.h" diff --git a/projects/mtg/src/PlayerData.cpp b/projects/mtg/src/PlayerData.cpp index e4415bed5..6e202f576 100644 --- a/projects/mtg/src/PlayerData.cpp +++ b/projects/mtg/src/PlayerData.cpp @@ -1,8 +1,8 @@ -#include "../include/config.h" -#include "../include/GameOptions.h" -#include "../include/PlayerData.h" +#include "PrecompiledHeader.h" + +#include "GameOptions.h" +#include "PlayerData.h" -#include #include PlayerData::PlayerData(){ diff --git a/projects/mtg/src/Pos.cpp b/projects/mtg/src/Pos.cpp index 0707c9fba..5df26b9b9 100644 --- a/projects/mtg/src/Pos.cpp +++ b/projects/mtg/src/Pos.cpp @@ -1,5 +1,7 @@ +#include "PrecompiledHeader.h" + #include "JRenderer.h" -#include "../include/Pos.h" +#include "Pos.h" Pos::Pos(float x, float y, float z, float t, float a) : actX(x), actY(y), actZ(z), actT(t), actA(a), x(x), y(y), zoom(z), t(t), alpha(a) {} void Pos::Update(float dt) diff --git a/projects/mtg/src/PrecompiledHeader.cpp b/projects/mtg/src/PrecompiledHeader.cpp new file mode 100644 index 000000000..f07790a06 --- /dev/null +++ b/projects/mtg/src/PrecompiledHeader.cpp @@ -0,0 +1 @@ +#include "PrecompiledHeader.h" \ No newline at end of file diff --git a/projects/mtg/src/PriceList.cpp b/projects/mtg/src/PriceList.cpp index dd59b5e78..af720b038 100644 --- a/projects/mtg/src/PriceList.cpp +++ b/projects/mtg/src/PriceList.cpp @@ -1,5 +1,6 @@ -#include "../include/config.h" -#include "../include/PriceList.h" +#include "PrecompiledHeader.h" + +#include "PriceList.h" int PriceList::randomKey = 0; diff --git a/projects/mtg/src/ReplacementEffects.cpp b/projects/mtg/src/ReplacementEffects.cpp index 04b108d3c..b8cb4a087 100644 --- a/projects/mtg/src/ReplacementEffects.cpp +++ b/projects/mtg/src/ReplacementEffects.cpp @@ -1,7 +1,8 @@ -#include "../include/config.h" -#include "../include/ReplacementEffects.h" -#include "../include/MTGCardInstance.h" -#include "../include/TargetChooser.h" +#include "PrecompiledHeader.h" + +#include "ReplacementEffects.h" +#include "MTGCardInstance.h" +#include "TargetChooser.h" diff --git a/projects/mtg/src/Rules.cpp b/projects/mtg/src/Rules.cpp index 69154bf86..341382515 100644 --- a/projects/mtg/src/Rules.cpp +++ b/projects/mtg/src/Rules.cpp @@ -1,14 +1,13 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/Rules.h" -#include "../include/MTGDefinitions.h" -#include "../include/config.h" -#include "../include/ManaCost.h" -#include "../include/Player.h" -#include "../include/AIMomirPlayer.h" +#include "PrecompiledHeader.h" -#include "../include/MTGGameZones.h" -#include "../include/MTGAbility.h" +#include "Rules.h" +#include "MTGDefinitions.h" +#include "ManaCost.h" +#include "Player.h" +#include "AIMomirPlayer.h" + +#include "MTGGameZones.h" +#include "MTGAbility.h" int Rules::getMTGId(string cardName){ int cardnb = atoi(cardName.c_str()); diff --git a/projects/mtg/src/SimpleMenu.cpp b/projects/mtg/src/SimpleMenu.cpp index e44852fcc..5a7247562 100644 --- a/projects/mtg/src/SimpleMenu.cpp +++ b/projects/mtg/src/SimpleMenu.cpp @@ -1,9 +1,10 @@ -#include "../include/config.h" -#include "../include/SimpleMenu.h" -#include "../include/SimpleMenuItem.h" +#include "PrecompiledHeader.h" + +#include "SimpleMenu.h" +#include "SimpleMenuItem.h" #include "JTypes.h" -#include "../include/GameApp.h" -#include "../include/Translate.h" +#include "GameApp.h" +#include "Translate.h" namespace { diff --git a/projects/mtg/src/SimpleMenuItem.cpp b/projects/mtg/src/SimpleMenuItem.cpp index 1a8db3d63..e739200e9 100644 --- a/projects/mtg/src/SimpleMenuItem.cpp +++ b/projects/mtg/src/SimpleMenuItem.cpp @@ -1,7 +1,8 @@ -#include "../include/config.h" -#include "../include/SimpleMenuItem.h" -#include "../include/Translate.h" -#include "../include/WResourceManager.h" +#include "PrecompiledHeader.h" + +#include "SimpleMenuItem.h" +#include "Translate.h" +#include "WResourceManager.h" SimpleMenuItem::SimpleMenuItem(SimpleMenu* _parent, int id, int fontId, string text, int x, int y, bool hasFocus, bool autoTranslate): JGuiObject(id), parent(_parent), fontId(fontId), mX(x), mY(y) { diff --git a/projects/mtg/src/SimplePad.cpp b/projects/mtg/src/SimplePad.cpp index 7772b6b06..2f385b57c 100644 --- a/projects/mtg/src/SimplePad.cpp +++ b/projects/mtg/src/SimplePad.cpp @@ -1,8 +1,9 @@ -#include "../include/config.h" -#include "../include/SimplePad.h" +#include "PrecompiledHeader.h" + +#include "SimplePad.h" #include "JTypes.h" -#include "../include/GameApp.h" -#include "../include/Translate.h" +#include "GameApp.h" +#include "Translate.h" #define ALPHA_COLUMNS 8 diff --git a/projects/mtg/src/StoryFlow.cpp b/projects/mtg/src/StoryFlow.cpp index f380d2c78..b51a083c2 100644 --- a/projects/mtg/src/StoryFlow.cpp +++ b/projects/mtg/src/StoryFlow.cpp @@ -1,14 +1,14 @@ -#include "../include/StoryFlow.h" -#include "../include/MTGDefinitions.h" -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/WResourceManager.h" -#include "../include/AIPlayer.h" -#include "../include/Rules.h" -#include "../include/Credits.h" -#include "../include/PlayerData.h" -#include "../include/MTGDeck.h" -#include "../include/WFont.h" +#include "PrecompiledHeader.h" + +#include "StoryFlow.h" +#include "MTGDefinitions.h" +#include "WResourceManager.h" +#include "AIPlayer.h" +#include "Rules.h" +#include "Credits.h" +#include "PlayerData.h" +#include "MTGDeck.h" +#include "WFont.h" #include #include diff --git a/projects/mtg/src/StyleManager.cpp b/projects/mtg/src/StyleManager.cpp index 3ca68619d..fc6cf4d5c 100644 --- a/projects/mtg/src/StyleManager.cpp +++ b/projects/mtg/src/StyleManager.cpp @@ -1,11 +1,12 @@ -#include "../include/config.h" -#include "../include/GameApp.h" -#include "../include/GuiBackground.h" -#include "../include/GameObserver.h" -#include "../include/Rules.h" -#include "../include/DeckDataWrapper.h" -#include "../include/WFilter.h" -#include "../include/StyleManager.h" +#include "PrecompiledHeader.h" + +#include "GameApp.h" +#include "GuiBackground.h" +#include "GameObserver.h" +#include "Rules.h" +#include "DeckDataWrapper.h" +#include "WFilter.h" +#include "StyleManager.h" #include "../../../JGE/src/tinyxml/tinyxml.h" void StyleManager::killRules(){ diff --git a/projects/mtg/src/Subtypes.cpp b/projects/mtg/src/Subtypes.cpp index 4229de8d7..8a622cba5 100644 --- a/projects/mtg/src/Subtypes.cpp +++ b/projects/mtg/src/Subtypes.cpp @@ -1,5 +1,6 @@ -#include "../include/config.h" -#include "../include/Subtypes.h" +#include "PrecompiledHeader.h" + +#include "Subtypes.h" #include #include diff --git a/projects/mtg/src/TargetChooser.cpp b/projects/mtg/src/TargetChooser.cpp index 7a350e666..d2995150a 100644 --- a/projects/mtg/src/TargetChooser.cpp +++ b/projects/mtg/src/TargetChooser.cpp @@ -1,12 +1,12 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/TargetChooser.h" -#include "../include/CardDescriptor.h" -#include "../include/MTGGameZones.h" -#include "../include/GameObserver.h" -#include "../include/Subtypes.h" -#include "../include/Counters.h" -#include "../include/WEvent.h" +#include "PrecompiledHeader.h" + +#include "TargetChooser.h" +#include "CardDescriptor.h" +#include "MTGGameZones.h" +#include "GameObserver.h" +#include "Subtypes.h" +#include "Counters.h" +#include "WEvent.h" TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInstance * card, MTGAbility * ability){ diff --git a/projects/mtg/src/TargetsList.cpp b/projects/mtg/src/TargetsList.cpp index 4df1a055a..63c87b1e6 100644 --- a/projects/mtg/src/TargetsList.cpp +++ b/projects/mtg/src/TargetsList.cpp @@ -1,9 +1,10 @@ -#include "../include/config.h" -#include "../include/TargetsList.h" -#include "../include/Player.h" -#include "../include/MTGCardInstance.h" -#include "../include/Damage.h" -#include "../include/ActionStack.h" +#include "PrecompiledHeader.h" + +#include "TargetsList.h" +#include "Player.h" +#include "MTGCardInstance.h" +#include "Damage.h" +#include "ActionStack.h" TargetsList::TargetsList(){ cursor = 0; diff --git a/projects/mtg/src/Tasks.cpp b/projects/mtg/src/Tasks.cpp index fa0097a14..75b5c06d4 100644 --- a/projects/mtg/src/Tasks.cpp +++ b/projects/mtg/src/Tasks.cpp @@ -1,11 +1,11 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/GameApp.h" -#include "../include/Player.h" -#include "../include/Tasks.h" -#include "../include/AIPlayer.h" -#include "../include/Translate.h" -#include "../include/MTGDefinitions.h" +#include "PrecompiledHeader.h" + +#include "GameApp.h" +#include "Player.h" +#include "Tasks.h" +#include "AIPlayer.h" +#include "Translate.h" +#include "MTGDefinitions.h" #include #include diff --git a/projects/mtg/src/TestSuiteAI.cpp b/projects/mtg/src/TestSuiteAI.cpp index a1b624558..ab547eafe 100644 --- a/projects/mtg/src/TestSuiteAI.cpp +++ b/projects/mtg/src/TestSuiteAI.cpp @@ -1,15 +1,14 @@ -#include "../include/TestSuiteAI.h" -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/MTGAbility.h" -#include "../include/MTGRules.h" -#include "../include/ActionLayer.h" -#include "../include/GuiCombat.h" -#include "../include/Rules.h" -#include "../include/GameObserver.h" -#include "../include/GameStateShop.h" +#include "PrecompiledHeader.h" + +#include "TestSuiteAI.h" +#include "MTGAbility.h" +#include "MTGRules.h" +#include "ActionLayer.h" +#include "GuiCombat.h" +#include "Rules.h" +#include "GameObserver.h" +#include "GameStateShop.h" -#include using std::string; // NULL is sent in place of a MTGDeck since there is no way to create a MTGDeck without a proper deck file. diff --git a/projects/mtg/src/TextScroller.cpp b/projects/mtg/src/TextScroller.cpp index c5544f43e..fb692be70 100644 --- a/projects/mtg/src/TextScroller.cpp +++ b/projects/mtg/src/TextScroller.cpp @@ -1,7 +1,9 @@ -#include "../include/TextScroller.h" -#include "../include/WResourceManager.h" -#include "../include/utils.h" -#include "../include/WFont.h" +#include "PrecompiledHeader.h" + +#include "TextScroller.h" +#include "WResourceManager.h" +#include "utils.h" +#include "WFont.h" TextScroller::TextScroller(int fontId, float x, float y, float width, float speed):JGuiObject(0),fontId(fontId){ mWidth = width; diff --git a/projects/mtg/src/ThisDescriptor.cpp b/projects/mtg/src/ThisDescriptor.cpp index 359bc284d..fefceaa11 100644 --- a/projects/mtg/src/ThisDescriptor.cpp +++ b/projects/mtg/src/ThisDescriptor.cpp @@ -1,8 +1,9 @@ -#include "../include/config.h" -#include "../include/ThisDescriptor.h" -#include "../include/Counters.h" -#include "../include/MTGCardInstance.h" -#include "../include/CardDescriptor.h" +#include "PrecompiledHeader.h" + +#include "ThisDescriptor.h" +#include "Counters.h" +#include "MTGCardInstance.h" +#include "CardDescriptor.h" ThisDescriptor::~ThisDescriptor(){ diff --git a/projects/mtg/src/Token.cpp b/projects/mtg/src/Token.cpp index 6f441281c..adaf15900 100644 --- a/projects/mtg/src/Token.cpp +++ b/projects/mtg/src/Token.cpp @@ -1,4 +1,6 @@ -#include "../include/Token.h" +#include "PrecompiledHeader.h" + +#include "Token.h" Token::Token(string _name, MTGCardInstance * source, int _power, int _toughness):MTGCardInstance(){ isToken = true; diff --git a/projects/mtg/src/Translate.cpp b/projects/mtg/src/Translate.cpp index f9a11549b..1d4e8d2dc 100644 --- a/projects/mtg/src/Translate.cpp +++ b/projects/mtg/src/Translate.cpp @@ -1,9 +1,9 @@ -#include "../include/Translate.h" -#include "../include/config.h" -#include "../include/GameOptions.h" +#include "PrecompiledHeader.h" + +#include "Translate.h" +#include "GameOptions.h" #include #include -#include Translator * Translator::mInstance = NULL; diff --git a/projects/mtg/src/TranslateKeys.cpp b/projects/mtg/src/TranslateKeys.cpp index c87907408..e3779840f 100644 --- a/projects/mtg/src/TranslateKeys.cpp +++ b/projects/mtg/src/TranslateKeys.cpp @@ -1,7 +1,8 @@ -#include -#include "../include/Translate.h" -#include "../include/WResourceManager.h" -#include "../include/TranslateKeys.h" +#include "PrecompiledHeader.h" + +#include "Translate.h" +#include "WResourceManager.h" +#include "TranslateKeys.h" using std::string; using std::map; diff --git a/projects/mtg/src/Trash.cpp b/projects/mtg/src/Trash.cpp index 6d1111f16..869f4e649 100644 --- a/projects/mtg/src/Trash.cpp +++ b/projects/mtg/src/Trash.cpp @@ -1,9 +1,10 @@ -#include -#include "../include/MTGDefinitions.h" -#include "../include/Pos.h" -#include "../include/CardGui.h" -#include "../include/DamagerDamaged.h" -#include "../include/Trash.h" +#include "PrecompiledHeader.h" + +#include "MTGDefinitions.h" +#include "Pos.h" +#include "CardGui.h" +#include "DamagerDamaged.h" +#include "Trash.h" template void TrashBin::put_out() diff --git a/projects/mtg/src/WCachedResource.cpp b/projects/mtg/src/WCachedResource.cpp index 8af8072da..f85b4ba38 100644 --- a/projects/mtg/src/WCachedResource.cpp +++ b/projects/mtg/src/WCachedResource.cpp @@ -1,16 +1,14 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/utils.h" -#include +#include "PrecompiledHeader.h" + +#include "utils.h" #include -#include #include #include #include -#include "../include/GameOptions.h" -#include "../include/WResourceManager.h" +#include "GameOptions.h" +#include "WResourceManager.h" #include -#include + #ifdef WITH_FMOD #endif diff --git a/projects/mtg/src/WDataSrc.cpp b/projects/mtg/src/WDataSrc.cpp index 54fe958cb..f1ce549c6 100644 --- a/projects/mtg/src/WDataSrc.cpp +++ b/projects/mtg/src/WDataSrc.cpp @@ -1,9 +1,10 @@ -#include "../include/config.h" -#include "../include/OptionItem.h" -#include "../include/PlayerData.h" -#include "../include/Translate.h" -#include "../include/PriceList.h" -#include "../include/Subtypes.h" +#include "PrecompiledHeader.h" + +#include "OptionItem.h" +#include "PlayerData.h" +#include "Translate.h" +#include "PriceList.h" +#include "Subtypes.h" #include //WSyncable diff --git a/projects/mtg/src/WEvent.cpp b/projects/mtg/src/WEvent.cpp index 45bbe5958..9d0e81559 100644 --- a/projects/mtg/src/WEvent.cpp +++ b/projects/mtg/src/WEvent.cpp @@ -1,8 +1,10 @@ -#include "../include/WEvent.h" -#include "../include/MTGCardInstance.h" -#include "../include/MTGGameZones.h" -#include "../include/Damage.h" -#include "../include/PhaseRing.h" +#include "PrecompiledHeader.h" + +#include "WEvent.h" +#include "MTGCardInstance.h" +#include "MTGGameZones.h" +#include "Damage.h" +#include "PhaseRing.h" WEvent::WEvent(int type) : type(type){} diff --git a/projects/mtg/src/WFilter.cpp b/projects/mtg/src/WFilter.cpp index e5e2020bc..d15c1ac99 100644 --- a/projects/mtg/src/WFilter.cpp +++ b/projects/mtg/src/WFilter.cpp @@ -1,7 +1,8 @@ -#include "../include/config.h" -#include "../include/OptionItem.h" -#include "../include/PlayerData.h" -#include "../include/Translate.h" +#include "PrecompiledHeader.h" + +#include "OptionItem.h" +#include "PlayerData.h" +#include "Translate.h" #include diff --git a/projects/mtg/src/WFont.cpp b/projects/mtg/src/WFont.cpp index 5304d321b..990b3871b 100644 --- a/projects/mtg/src/WFont.cpp +++ b/projects/mtg/src/WFont.cpp @@ -1,6 +1,7 @@ -#include "../include/config.h" -#include "../include/WFont.h" -#include "../include/WResourceManager.h" +#include "PrecompiledHeader.h" + +#include "WFont.h" +#include "WResourceManager.h" #include "JFileSystem.h" #define ISGBK(c) ((c) > 0x80 || (c) < 0x30 || (c) == '-' || (c) == '/') diff --git a/projects/mtg/src/WGui.cpp b/projects/mtg/src/WGui.cpp index 280ecfac0..738b9886e 100644 --- a/projects/mtg/src/WGui.cpp +++ b/projects/mtg/src/WGui.cpp @@ -1,9 +1,10 @@ -#include "../include/config.h" -#include "../include/OptionItem.h" -#include "../include/PlayerData.h" -#include "../include/Translate.h" -#include "../include/Subtypes.h" -#include "../include/TranslateKeys.h" +#include "PrecompiledHeader.h" + +#include "OptionItem.h" +#include "PlayerData.h" +#include "Translate.h" +#include "Subtypes.h" +#include "TranslateKeys.h" #include #include #include diff --git a/projects/mtg/src/WResourceManager.cpp b/projects/mtg/src/WResourceManager.cpp index 7dcd5cb3a..4b709d0f3 100644 --- a/projects/mtg/src/WResourceManager.cpp +++ b/projects/mtg/src/WResourceManager.cpp @@ -1,21 +1,20 @@ -#include "../include/config.h" -#include "../include/DebugRoutines.h" -#include "../include/utils.h" -#include "../include/GameOptions.h" -#include +#include "PrecompiledHeader.h" + #include -#include #include #include #include -#include -#include "../include/WResourceManager.h" -#include "../include/StyleManager.h" + +#include "utils.h" +#include "GameOptions.h" +#include "WResourceManager.h" +#include "StyleManager.h" + #if defined (WIN32) #include #include #endif -#include "../include/WFont.h" +#include "WFont.h" extern bool neofont; int idCounter = OTHERS_OFFSET; diff --git a/projects/mtg/src/utils.cpp b/projects/mtg/src/utils.cpp index d09bf4383..4ccd294d6 100644 --- a/projects/mtg/src/utils.cpp +++ b/projects/mtg/src/utils.cpp @@ -1,8 +1,6 @@ -#include "../include/config.h" -#include "../include/utils.h" -#include -#include -#include +#include "PrecompiledHeader.h" + +#include "utils.h" using std::vector; @@ -205,17 +203,17 @@ string& rtrim(string &str) return str; } -std::vector &split(const std::string &s, char delim, std::vector &elems) { - std::stringstream ss(s); - std::string item; - while(std::getline(ss, item, delim)) { - elems.push_back(item); - } - return elems; -} - - -std::vector split(const std::string &s, char delim) { - std::vector elems; - return split(s, delim, elems); -} +std::vector &split(const std::string &s, char delim, std::vector &elems) { + std::stringstream ss(s); + std::string item; + while(std::getline(ss, item, delim)) { + elems.push_back(item); + } + return elems; +} + + +std::vector split(const std::string &s, char delim) { + std::vector elems; + return split(s, delim, elems); +} diff --git a/projects/mtg/template.vcproj b/projects/mtg/template.vcproj index 881eab3b3..07c12c422 100644 --- a/projects/mtg/template.vcproj +++ b/projects/mtg/template.vcproj @@ -50,11 +50,13 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""$(MTGEXTRAS)";../../JGE/include;../../JGE/Dependencies/include" + AdditionalIncludeDirectories=""$(MTGEXTRAS)";./include;../../JGE/include;../../JGE/Dependencies/include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="PrecompiledHeader.h" PrecompiledHeaderFile=".\Release/template.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" @@ -145,11 +147,13 @@ + + + + + + + + + + + + + + @@ -1154,6 +1202,10 @@ RelativePath=".\include\Pos.h" > + +