From ad5edc224dc1ff4e7a61e8014cc14c2225d03106 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Mon, 7 Nov 2011 23:32:02 +0000 Subject: [PATCH] Symbian^3 compilation fixes. --- JGE/src/JFileSystem.cpp | 8 +++++--- JGE/src/JGE.cpp | 2 ++ JGE/src/zipFS/zfsystem.cpp | 3 ++- projects/mtg/src/AIPlayer.cpp | 2 +- projects/mtg/src/ActionStack.cpp | 3 +-- projects/mtg/src/CardDisplay.cpp | 2 +- projects/mtg/src/GuiAvatars.cpp | 2 +- projects/mtg/src/GuiHand.cpp | 2 +- projects/mtg/src/GuiPhaseBar.cpp | 2 +- projects/mtg/src/GuiPlay.cpp | 2 +- projects/mtg/src/MTGGameZones.cpp | 2 +- projects/mtg/src/MTGRules.cpp | 2 +- 12 files changed, 18 insertions(+), 14 deletions(-) diff --git a/JGE/src/JFileSystem.cpp b/JGE/src/JFileSystem.cpp index 5923879ed..8ff89cf29 100644 --- a/JGE/src/JFileSystem.cpp +++ b/JGE/src/JFileSystem.cpp @@ -142,14 +142,16 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath) // Make sure the base paths finish with a '/' or a '\' if (! userPath.empty()) { - string::iterator c = --(userPath.end()); + string::iterator c = userPath.end();//userPath.at(userPath.size()-1); + c--; if ((*c != '/') && (*c != '\\')) userPath += '/'; } if (! systemPath.empty()) { - string::iterator c = --(systemPath.end()); - if ((*c != '/') && (*c != '\\')) + string::iterator c = systemPath.end();//systemPath.at(systemPath.size()-1); + c--; + if ((*c != '/') && (*c != '\\')) systemPath += '/'; } diff --git a/JGE/src/JGE.cpp b/JGE/src/JGE.cpp index 361199f1c..2fbacc779 100644 --- a/JGE/src/JGE.cpp +++ b/JGE/src/JGE.cpp @@ -44,7 +44,9 @@ u8 JGE::GetAnalogY() #elif defined (LINUX) // Unix specific code #include +#ifdef WITH_FMOD #include "../Dependencies/include/fmod.h" +#endif //WITH_FMOD u8 JGE::GetAnalogX() diff --git a/JGE/src/zipFS/zfsystem.cpp b/JGE/src/zipFS/zfsystem.cpp index 7116bd1b5..9a4c0ae95 100644 --- a/JGE/src/zipFS/zfsystem.cpp +++ b/JGE/src/zipFS/zfsystem.cpp @@ -51,7 +51,8 @@ filesystem::filesystem(const char * BasePath, const char * FileExt, bool Default // Init m_BasePath and be sure the base path finish with a '/' or a '\' if (! m_BasePath.empty()) { - string::iterator c = --(m_BasePath.end()); + string::iterator c = m_BasePath.end(); + c--; if ((*c != '/') && (*c != '\\')) m_BasePath += '/'; } diff --git a/projects/mtg/src/AIPlayer.cpp b/projects/mtg/src/AIPlayer.cpp index 78de54ecd..7ffea7b43 100644 --- a/projects/mtg/src/AIPlayer.cpp +++ b/projects/mtg/src/AIPlayer.cpp @@ -3,7 +3,7 @@ #include "AIPlayer.h" #include "GameStateDuel.h" #include "DeckManager.h" -#include "CardSelectorSingleton.h" +#include "CardSelector.h" // Instances for Factory diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp index ed61ee94d..798889141 100644 --- a/projects/mtg/src/ActionStack.cpp +++ b/projects/mtg/src/ActionStack.cpp @@ -5,7 +5,6 @@ The Action Stack contains all information for Game Events that can be interrupte #include "ActionStack.h" #include "CardGui.h" -#include "CardSelectorSingleton.h" #include "Damage.h" #include "GameObserver.h" #include "ManaCost.h" @@ -16,7 +15,7 @@ The Action Stack contains all information for Game Events that can be interrupte #include "WResourceManager.h" #include "ModRules.h" #include "AllAbilities.h" - +#include "CardSelector.h" #include namespace diff --git a/projects/mtg/src/CardDisplay.cpp b/projects/mtg/src/CardDisplay.cpp index d444597f9..e9b9c3159 100644 --- a/projects/mtg/src/CardDisplay.cpp +++ b/projects/mtg/src/CardDisplay.cpp @@ -2,7 +2,7 @@ #include "CardDisplay.h" #include "CardGui.h" -#include "CardSelectorSingleton.h" +#include "CardSelector.h" #include "TargetChooser.h" #include "MTGGameZones.h" #include "GameObserver.h" diff --git a/projects/mtg/src/GuiAvatars.cpp b/projects/mtg/src/GuiAvatars.cpp index ebef50122..46186f8c3 100644 --- a/projects/mtg/src/GuiAvatars.cpp +++ b/projects/mtg/src/GuiAvatars.cpp @@ -1,6 +1,6 @@ #include "PrecompiledHeader.h" -#include "CardSelectorSingleton.h" +#include "CardSelector.h" #include "GameApp.h" #include "GuiAvatars.h" #include "GameObserver.h" diff --git a/projects/mtg/src/GuiHand.cpp b/projects/mtg/src/GuiHand.cpp index 037660503..6e82ce290 100644 --- a/projects/mtg/src/GuiHand.cpp +++ b/projects/mtg/src/GuiHand.cpp @@ -1,6 +1,6 @@ #include "PrecompiledHeader.h" -#include "CardSelectorSingleton.h" +#include "CardSelector.h" #include "CardSelector.h" #include "GameApp.h" #include "Trash.h" diff --git a/projects/mtg/src/GuiPhaseBar.cpp b/projects/mtg/src/GuiPhaseBar.cpp index 3ded79fcc..745ee7158 100644 --- a/projects/mtg/src/GuiPhaseBar.cpp +++ b/projects/mtg/src/GuiPhaseBar.cpp @@ -4,7 +4,7 @@ #include "GuiPhaseBar.h" #include "GameObserver.h" #include "Translate.h" -#include "CardSelectorSingleton.h" +#include "CardSelector.h" /* static int colors[] = diff --git a/projects/mtg/src/GuiPlay.cpp b/projects/mtg/src/GuiPlay.cpp index c4dd5f168..9e88603f3 100644 --- a/projects/mtg/src/GuiPlay.cpp +++ b/projects/mtg/src/GuiPlay.cpp @@ -1,6 +1,6 @@ #include "PrecompiledHeader.h" -#include "CardSelectorSingleton.h" +#include "CardSelector.h" #include "GameApp.h" #include "GuiPlay.h" #include "Subtypes.h" diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp index 7192adef1..d838c3eaa 100644 --- a/projects/mtg/src/MTGGameZones.cpp +++ b/projects/mtg/src/MTGGameZones.cpp @@ -1,6 +1,6 @@ #include "PrecompiledHeader.h" -#include "CardSelectorSingleton.h" +#include "CardSelector.h" #include "MTGGameZones.h" #include "Player.h" #include "WEvent.h" diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp index 63514424e..995bf6f25 100644 --- a/projects/mtg/src/MTGRules.cpp +++ b/projects/mtg/src/MTGRules.cpp @@ -1,6 +1,6 @@ #include "PrecompiledHeader.h" -#include "CardSelectorSingleton.h" +#include "CardSelector.h" #include "MTGRules.h" #include "Translate.h" #include "Subtypes.h"