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:
wrenczes
2010-10-24 05:55:24 +00:00
parent c83a4b8d19
commit d5f3e4cfea
130 changed files with 804 additions and 683 deletions
+7 -6
View File
@@ -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;
+9 -9
View File
@@ -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"};
+8 -7
View File
@@ -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;
+6 -4
View File
@@ -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;
+6 -7
View File
@@ -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++){
+12 -12
View File
@@ -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>
+5 -4
View File
@@ -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(){
+7 -6
View File
@@ -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;
+9 -10
View File
@@ -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;
+5 -6
View File
@@ -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;
+6 -7
View File
@@ -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;
+4 -3
View File
@@ -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);
+12 -11
View File
@@ -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;
+9 -8
View File
@@ -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);
+3 -2
View File
@@ -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
+6 -5
View File
@@ -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;
+3 -1
View File
@@ -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 )
+6 -5
View File
@@ -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
+5 -4
View File
@@ -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;
+13 -12
View File
@@ -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(){
+8 -8
View File
@@ -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)
+17 -17
View File
@@ -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
+3 -3
View File
@@ -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";
+8 -8
View File
@@ -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>
+10 -10
View File
@@ -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>
+9 -9
View File
@@ -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
+9 -8
View File
@@ -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,
+11 -12
View File
@@ -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.
+16 -16
View File
@@ -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)
+13 -12
View File
@@ -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";
+9 -8
View File
@@ -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() {}
+9 -8
View File
@@ -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>
+6 -5
View File
@@ -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>
+8 -7
View File
@@ -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;
+5 -4
View File
@@ -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
+6 -5
View File
@@ -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()
{
+3 -2
View File
@@ -1,4 +1,5 @@
#include "../include/config.h"
#include "../include/GuiCardsController.h"
#include "PrecompiledHeader.h"
#include "GuiCardsController.h"
+7 -7
View File
@@ -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;
+4 -3
View File
@@ -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()
{
+6 -5
View File
@@ -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;
+4 -3
View File
@@ -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;
+4 -4
View File
@@ -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;
+6 -5
View File
@@ -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[] =
+5 -4
View File
@@ -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)
+4 -3
View File
@@ -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()
+3 -4
View File
@@ -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;
+12 -12
View File
@@ -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)
+7 -6
View File
@@ -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;
+7 -5
View File
@@ -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;
+12 -13
View File
@@ -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>
+3 -1
View File
@@ -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"};
+3 -2
View File
@@ -1,5 +1,6 @@
#include "../include/config.h"
#include "../include/MTGGamePhase.h"
#include "PrecompiledHeader.h"
#include "MTGGamePhase.h"
MTGGamePhase::MTGGamePhase(int id):ActionElement(id){
+7 -7
View File
@@ -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>
+9 -9
View File
@@ -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;
+6 -6
View File
@@ -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"
+10 -10
View File
@@ -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)
+3 -1
View File
@@ -1,4 +1,6 @@
#include "../include/ManaCostHybrid.h"
#include "PrecompiledHeader.h"
#include "ManaCostHybrid.h"
ManaCostHybrid::ManaCostHybrid(){
init(0,0,0,0);
+5 -4
View File
@@ -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)
{
+8 -7
View File
@@ -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>
+6 -6
View File
@@ -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
+3 -3
View File
@@ -1,6 +1,6 @@
#include <iostream>
#include "../include/config.h"
#include "../include/PlayGuiObject.h"
#include "PrecompiledHeader.h"
#include "PlayGuiObject.h"
using namespace std;
+5 -4
View File
@@ -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;
+6 -5
View File
@@ -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"
+4 -4
View File
@@ -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(){
+3 -1
View File
@@ -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)
+1
View File
@@ -0,0 +1 @@
#include "PrecompiledHeader.h"
+3 -2
View File
@@ -1,5 +1,6 @@
#include "../include/config.h"
#include "../include/PriceList.h"
#include "PrecompiledHeader.h"
#include "PriceList.h"
int PriceList::randomKey = 0;
+5 -4
View File
@@ -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"
+9 -10
View File
@@ -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());
+6 -5
View File
@@ -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
{
+5 -4
View File
@@ -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)
{
+5 -4
View File
@@ -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
+11 -11
View File
@@ -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 <JGE.h>
#include <JFileSystem.h>
+9 -8
View File
@@ -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(){
+3 -2
View File
@@ -1,5 +1,6 @@
#include "../include/config.h"
#include "../include/Subtypes.h"
#include "PrecompiledHeader.h"
#include "Subtypes.h"
#include <JGE.h>
#include <algorithm>
+9 -9
View File
@@ -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){
+7 -6
View File
@@ -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;
+8 -8
View File
@@ -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 <JRenderer.h>
#include <math.h>
+10 -11
View File
@@ -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 <string>
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.
+6 -4
View File
@@ -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;
+6 -5
View File
@@ -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(){
+3 -1
View File
@@ -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;
+4 -4
View File
@@ -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 <JGE.h>
#include <fstream>
#include <iostream>
Translator * Translator::mInstance = NULL;
+5 -4
View File
@@ -1,7 +1,8 @@
#include <map>
#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;
+7 -6
View File
@@ -1,9 +1,10 @@
#include <iostream>
#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 <class T>
void TrashBin<T>::put_out()
+6 -8
View File
@@ -1,16 +1,14 @@
#include "../include/config.h"
#include "../include/DebugRoutines.h"
#include "../include/utils.h"
#include <iostream>
#include "PrecompiledHeader.h"
#include "utils.h"
#include <fstream>
#include <string>
#include <stdlib.h>
#include <JGE.h>
#include <JFileSystem.h>
#include "../include/GameOptions.h"
#include "../include/WResourceManager.h"
#include "GameOptions.h"
#include "WResourceManager.h"
#include <hge/hgeparticle.h>
#include <assert.h>
#ifdef WITH_FMOD
#endif
+7 -6
View File
@@ -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 <algorithm>
//WSyncable
+7 -5
View File
@@ -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){}
+5 -4
View File
@@ -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 <algorithm>
+4 -3
View File
@@ -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) == '/')
+7 -6
View File
@@ -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 <sstream>
#include <algorithm>
#include <hge/hgedistort.h>
+9 -10
View File
@@ -1,21 +1,20 @@
#include "../include/config.h"
#include "../include/DebugRoutines.h"
#include "../include/utils.h"
#include "../include/GameOptions.h"
#include <iostream>
#include "PrecompiledHeader.h"
#include <fstream>
#include <string>
#include <stdlib.h>
#include <JGE.h>
#include <JFileSystem.h>
#include <assert.h>
#include "../include/WResourceManager.h"
#include "../include/StyleManager.h"
#include "utils.h"
#include "GameOptions.h"
#include "WResourceManager.h"
#include "StyleManager.h"
#if defined (WIN32)
#include <sys/types.h>
#include <sys/stat.h>
#endif
#include "../include/WFont.h"
#include "WFont.h"
extern bool neofont;
int idCounter = OTHERS_OFFSET;
+17 -19
View File
@@ -1,8 +1,6 @@
#include "../include/config.h"
#include "../include/utils.h"
#include <vector>
#include <sstream>
#include <string>
#include "PrecompiledHeader.h"
#include "utils.h"
using std::vector;
@@ -205,17 +203,17 @@ string& rtrim(string &str)
return str;
}
std::vector<std::string> &split(const std::string &s, char delim, std::vector<std::string> &elems) {
std::stringstream ss(s);
std::string item;
while(std::getline(ss, item, delim)) {
elems.push_back(item);
}
return elems;
}
std::vector<std::string> split(const std::string &s, char delim) {
std::vector<std::string> elems;
return split(s, delim, elems);
}
std::vector<std::string> &split(const std::string &s, char delim, std::vector<std::string> &elems) {
std::stringstream ss(s);
std::string item;
while(std::getline(ss, item, delim)) {
elems.push_back(item);
}
return elems;
}
std::vector<std::string> split(const std::string &s, char delim) {
std::vector<std::string> elems;
return split(s, delim, elems);
}