Enabled precompiled headers for the build. This cuts the win compile time in debug by at least half on my laptop; on the psp compile, it shaves it down by ~ 45 seconds. I only did a cursory inspection of what to add to PrecompiledHeader.h, there's probably more that we can throw in there for more incremental speed improvements.
Also fixed the project includes so that we don't need to always use the indirect include path, ie: #include "../include/foo.h" -> #include "foo.h" I'm don't know much about make files - if I busted the linux build, mea culpa, but I think we're okay on that front too. For future reference, here's the most straightforward link on the topic of adding pch support to make files: http://www.mercs-eng.com/~hulud/index.php?2008/06/13/6-writing-a-good-makefile-for-a-c-project
This commit is contained in:
@@ -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 $@ $< > $@
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef _CARD_DISPLAY_H_
|
||||
#define _CARD_DISPLAY_H_
|
||||
|
||||
#include "../include/PlayGuiObjectController.h"
|
||||
#include "PlayGuiObjectController.h"
|
||||
|
||||
class TargetChooser;
|
||||
class MTGGameZone;
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <JGE.h>
|
||||
#include "../include/WFont.h"
|
||||
#include "WFont.h"
|
||||
#include <time.h>
|
||||
#include "../include/Player.h"
|
||||
#include "Player.h"
|
||||
|
||||
class GameApp;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
// dirty, but I get OS header includes this way
|
||||
#include "JGE.h"
|
||||
|
||||
#include "../include/config.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <stdio.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 <map>
|
||||
#include <string>
|
||||
using std::map;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include "../include/DeckStats.h"
|
||||
#include "DeckStats.h"
|
||||
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#define _GAMEAPP_H_
|
||||
|
||||
|
||||
#include "../include/Logger.h"
|
||||
#include "Logger.h"
|
||||
|
||||
|
||||
#include <JApp.h>
|
||||
@@ -20,16 +20,16 @@
|
||||
#include <JSprite.h>
|
||||
#include <JLBFont.h>
|
||||
#include <hge/hgeparticle.h>
|
||||
#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
|
||||
|
||||
@@ -7,8 +7,8 @@ using std::map;
|
||||
using std::string;
|
||||
#include <JGE.h>
|
||||
#include <time.h>
|
||||
#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"
|
||||
|
||||
@@ -9,7 +9,7 @@ class JGE;
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
#include "../include/DeckMetaData.h"
|
||||
#include "DeckMetaData.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#define _GAME_STATE_AWARDS_H_
|
||||
|
||||
#include <JGE.h>
|
||||
#include "../include/GameState.h"
|
||||
#include "../include/SimpleMenu.h"
|
||||
#include "GameState.h"
|
||||
#include "SimpleMenu.h"
|
||||
|
||||
class WGuiList;
|
||||
class WGuiMenu;
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
#include <JGE.h>
|
||||
|
||||
#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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
#include <JGui.h>
|
||||
#include <dirent.h>
|
||||
#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
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <JGE.h>
|
||||
#include <JGui.h>
|
||||
#include "../include/GameState.h"
|
||||
#include "GameState.h"
|
||||
|
||||
class GameApp;
|
||||
class WGuiTabMenu;
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
#define _GAME_STATE_SHOP_H_
|
||||
|
||||
#include <JGE.h>
|
||||
#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
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#define _GAME_STATE_STORY_H_
|
||||
|
||||
|
||||
#include "../include/GameState.h"
|
||||
#include "GameState.h"
|
||||
#include <JGui.h>
|
||||
|
||||
class StoryFlow;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <JGE.h>
|
||||
#include <JGui.h>
|
||||
#include "../include/GameState.h"
|
||||
#include "GameState.h"
|
||||
|
||||
class TransitionBase: public GameState, public JGuiListener{
|
||||
public:
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#define DIR_RIGHT 4
|
||||
|
||||
#include <JGui.h>
|
||||
#include "../include/WEvent.h"
|
||||
#include "WEvent.h"
|
||||
|
||||
class GameObserver;
|
||||
class Player;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#include "string.h"
|
||||
#include <vector>
|
||||
#include <hge/hgeparticle.h>
|
||||
#include "config.h"
|
||||
#include "JGE.h"
|
||||
#include "MTGDefinitions.h"
|
||||
#include "GameApp.h"
|
||||
|
||||
@@ -14,13 +14,13 @@ class AManaProducer;
|
||||
class WEvent;
|
||||
class Counter;
|
||||
|
||||
#include "../include/GameObserver.h"
|
||||
#include "GameObserver.h"
|
||||
#include "ActionElement.h"
|
||||
#include <string>
|
||||
#include <map>
|
||||
#include <hge/hgeparticle.h>
|
||||
#include "../include/Damage.h"
|
||||
#include "../include/TargetChooser.h"
|
||||
#include "Damage.h"
|
||||
#include "TargetChooser.h"
|
||||
using std::string;
|
||||
using std::map;
|
||||
|
||||
|
||||
@@ -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 <string>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "GameObserver.h"
|
||||
|
||||
#include <JGui.h>
|
||||
#include "../include/WFont.h"
|
||||
#include "WFont.h"
|
||||
|
||||
|
||||
class MTGGamePhase: public ActionElement {
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef _MENU_ITEM_H
|
||||
#define _MENU_ITEM_H
|
||||
|
||||
#include "../include/WFont.h"
|
||||
#include "WFont.h"
|
||||
#include <JGui.h>
|
||||
#include <hge/hgeparticle.h>
|
||||
#include <string>
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
#include <JGui.h>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#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;
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
16
projects/mtg/include/PrecompiledHeader.h
Normal file
16
projects/mtg/include/PrecompiledHeader.h
Normal file
@@ -0,0 +1,16 @@
|
||||
#ifndef PRECOMPILEDHEADER_H
|
||||
#define PRECOMPILEDHEADER_H
|
||||
|
||||
#include <iostream>
|
||||
#include <list>
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "config.h"
|
||||
#include "DebugRoutines.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#endif //PRECOMPILEDHEADER_H
|
||||
@@ -2,8 +2,8 @@
|
||||
#define _PRICELIST_H_
|
||||
|
||||
#include<string>
|
||||
#include "../include/MTGDefinitions.h"
|
||||
#include "../include/MTGDeck.h"
|
||||
#include "MTGDefinitions.h"
|
||||
#include "MTGDeck.h"
|
||||
#include <stdio.h>
|
||||
|
||||
class MTGAllCards;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <list>
|
||||
using namespace std;
|
||||
#include "../include/Damage.h"
|
||||
#include "Damage.h"
|
||||
#include "WEvent.h"
|
||||
|
||||
class TargetChooser;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <JGui.h>
|
||||
#include "../include/WFont.h"
|
||||
#include "WFont.h"
|
||||
#include "hge/hgeparticle.h"
|
||||
|
||||
class SimpleMenu:public JGuiController{
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
#include <string>
|
||||
#include <JLBFont.h>
|
||||
#include <JGui.h>
|
||||
#include <string>
|
||||
#include "SimpleMenu.h"
|
||||
|
||||
using std::string;
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
#define TARGET_OK_NOT_READY 3
|
||||
|
||||
#include <JGE.h>
|
||||
#include "../include/TargetsList.h"
|
||||
#include "../include/ActionStack.h"
|
||||
#include "TargetsList.h"
|
||||
#include "ActionStack.h"
|
||||
|
||||
#include <string>
|
||||
using std::string;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#define MAX_TESTSUITE_ACTIONS 100
|
||||
#define MAX_TESTUITE_CARDS 100
|
||||
|
||||
#include "../include/AIPlayer.h"
|
||||
#include "AIPlayer.h"
|
||||
|
||||
class TestSuiteActions{
|
||||
public:
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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"};
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 <assert.h>
|
||||
#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++){
|
||||
|
||||
@@ -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 <typeinfo>
|
||||
|
||||
|
||||
@@ -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(){
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 <Vector2D.h>
|
||||
#include <assert.h>
|
||||
#include "../include/Counters.h"
|
||||
#include "Counters.h"
|
||||
|
||||
const float CardGui::Width = 28.0;
|
||||
const float CardGui::Height = 40.0;
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
#include "../include/CardPrimitive.h"
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include "CardPrimitive.h"
|
||||
|
||||
#include <string>
|
||||
#include <stdlib.h>
|
||||
|
||||
#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;
|
||||
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
#include <iostream>
|
||||
#include <assert.h>
|
||||
#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;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
#include "../include/DeckManager.h"
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include "DeckManager.h"
|
||||
#include <JRenderer.h>
|
||||
|
||||
void DeckManager::updateMetaDataList( vector<DeckMetaData *> * refList, bool isAI )
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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(){
|
||||
|
||||
|
||||
@@ -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 <JGE.h>
|
||||
|
||||
ExtraCost::ExtraCost(const std::string& inCostRenderString, TargetChooser *_tc)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "../include/config.h"
|
||||
#include "../include/DebugRoutines.h"
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include <JGE.h>
|
||||
#include <JRenderer.h>
|
||||
#if defined (WIN32) || defined (LINUX)
|
||||
@@ -8,21 +8,21 @@
|
||||
#include <pspfpu.h>
|
||||
#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
|
||||
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
// Copyright (c) 2007 James Hui (a.k.a. Dr.Watson) <jhkhui@gmail.com>
|
||||
//
|
||||
//-------------------------------------------------------------------------------------
|
||||
#include "../include/config.h"
|
||||
#include <string.h>
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include <JGameLauncher.h>
|
||||
|
||||
#include "../include/GameApp.h"
|
||||
#include "GameApp.h"
|
||||
|
||||
static char GameName[] = "Wagic";
|
||||
|
||||
|
||||
@@ -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 <JRenderer.h>
|
||||
|
||||
|
||||
@@ -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 <iostream>
|
||||
#include <sstream>
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include "utils.h"
|
||||
#include "MTGDeck.h"
|
||||
#include "GameOptions.h"
|
||||
#include "Translate.h"
|
||||
#include "OptionItem.h"
|
||||
#include "StyleManager.h"
|
||||
|
||||
#include <fstream>
|
||||
#include <string>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <JGE.h>
|
||||
|
||||
|
||||
@@ -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 <vector>
|
||||
#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
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
/*
|
||||
This is where the player views their awards, etc.
|
||||
*/
|
||||
#include "../include/config.h"
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include <JRenderer.h>
|
||||
#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,
|
||||
|
||||
@@ -3,20 +3,19 @@
|
||||
* Class handling the Deck Editor
|
||||
*/
|
||||
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include <math.h>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <JGE.h>
|
||||
#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 <vector>
|
||||
|
||||
#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.
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -3,19 +3,20 @@
|
||||
* Main Menu and Loading screen
|
||||
*/
|
||||
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include <math.h>
|
||||
#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";
|
||||
|
||||
|
||||
@@ -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() {}
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
/*
|
||||
The shop is where the player can buy cards, decks...
|
||||
*/
|
||||
#include "../include/config.h"
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include <JRenderer.h>
|
||||
#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 <hge/hgedistort.h>
|
||||
|
||||
|
||||
@@ -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 <dirent.h>
|
||||
#include <fstream>
|
||||
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
#include "../include/config.h"
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include <JRenderer.h>
|
||||
#include <JGui.h>
|
||||
#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;
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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()
|
||||
{
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "../include/config.h"
|
||||
#include "../include/GuiCardsController.h"
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include "GuiCardsController.h"
|
||||
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#include <assert.h>
|
||||
#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;
|
||||
|
||||
@@ -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()
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include <iostream>
|
||||
#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;
|
||||
|
||||
@@ -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[] =
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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 <iostream>
|
||||
#include <fstream>
|
||||
using namespace std;
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -3,15 +3,16 @@
|
||||
//-------------------------------------------------
|
||||
//TODO Fill BasicAbilities
|
||||
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include <string>
|
||||
#include <stdlib.h>
|
||||
|
||||
#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;
|
||||
|
||||
|
||||
@@ -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 <algorithm>
|
||||
using namespace std;
|
||||
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#include <string.h>
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
#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 <JGE.h>
|
||||
|
||||
|
||||
@@ -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"};
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "../include/config.h"
|
||||
#include "../include/MTGGamePhase.h"
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include "MTGGamePhase.h"
|
||||
|
||||
|
||||
MTGGamePhase::MTGGamePhase(int id):ActionElement(id){
|
||||
|
||||
@@ -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 <assert.h>
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include "MTGGameZones.h"
|
||||
#include "Player.h"
|
||||
#include "GameOptions.h"
|
||||
#include "WEvent.h"
|
||||
#include "MTGDeck.h"
|
||||
|
||||
#if defined (WIN32) || defined (LINUX)
|
||||
#include <time.h>
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include <JGui.h>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <dirent.h>
|
||||
#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;
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
#include "../include/ManaCostHybrid.h"
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include "ManaCostHybrid.h"
|
||||
|
||||
ManaCostHybrid::ManaCostHybrid(){
|
||||
init(0,0,0,0);
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
#include "../include/config.h"
|
||||
#include "../include/OptionItem.h"
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include "OptionItem.h"
|
||||
#include <JGE.h>
|
||||
#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 <dirent.h>
|
||||
#include <stdlib.h>
|
||||
#include <algorithm>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <iostream>
|
||||
#include "../include/config.h"
|
||||
#include "../include/PlayGuiObject.h"
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include "PlayGuiObject.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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 <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
PlayerData::PlayerData(){
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user