Symbian^3 compilation fixes.

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 += '/';
 	}
 

JGE/src/JGE.cpp

@@ -44,7 +44,9 @@ u8 JGE::GetAnalogY()
 
 #elif defined (LINUX)    // Unix specific code
 #include <sys/time.h>
+#ifdef WITH_FMOD
 #include "../Dependencies/include/fmod.h"
+#endif //WITH_FMOD
 
 
 u8 JGE::GetAnalogX()

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 += '/';
 	}

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

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 <typeinfo>
 
 namespace

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"

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"

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"

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[] =

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"

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"

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"