Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Symbian^3 compilation fixes.

Browse Source
This commit is contained in:
Xawotihs
2011-11-07 23:32:02 +00:00
parent eda32239ab
commit ad5edc224d
12 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
JGE/src/JFileSystem.cpp
View File

@@ -142,14 +142,16 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
// Make sure the base paths finish with a '/' or a '\' // Make sure the base paths finish with a '/' or a '\'
if (! userPath.empty()) { if (! userPath.empty()) {
string::iterator c = --(userPath.end()); string::iterator c = userPath.end();//userPath.at(userPath.size()-1);
c--;
if ((*c != '/') && (*c != '\\')) if ((*c != '/') && (*c != '\\'))
userPath += '/'; userPath += '/';
} }
if (! systemPath.empty()) { if (! systemPath.empty()) {
string::iterator c = --(systemPath.end()); string::iterator c = systemPath.end();//systemPath.at(systemPath.size()-1);
if ((*c != '/') && (*c != '\\')) c--;
if ((*c != '/') && (*c != '\\'))
systemPath += '/'; systemPath += '/';
} }

2
JGE/src/JGE.cpp
View File

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

3
JGE/src/zipFS/zfsystem.cpp
View File

@@ -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 '\' // Init m_BasePath and be sure the base path finish with a '/' or a '\'
if (! m_BasePath.empty()) { if (! m_BasePath.empty()) {
string::iterator c = --(m_BasePath.end()); string::iterator c = m_BasePath.end();
c--;
if ((*c != '/') && (*c != '\\')) if ((*c != '/') && (*c != '\\'))
m_BasePath += '/'; m_BasePath += '/';
} }

2
projects/mtg/src/AIPlayer.cpp
View File

@@ -3,7 +3,7 @@
#include "AIPlayer.h" #include "AIPlayer.h"
#include "GameStateDuel.h" #include "GameStateDuel.h"
#include "DeckManager.h" #include "DeckManager.h"
#include "CardSelectorSingleton.h" #include "CardSelector.h"
// Instances for Factory // Instances for Factory

3
projects/mtg/src/ActionStack.cpp
View File

@@ -5,7 +5,6 @@ The Action Stack contains all information for Game Events that can be interrupte
#include "ActionStack.h" #include "ActionStack.h"
#include "CardGui.h" #include "CardGui.h"
#include "CardSelectorSingleton.h"
#include "Damage.h" #include "Damage.h"
#include "GameObserver.h" #include "GameObserver.h"
#include "ManaCost.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 "WResourceManager.h"
#include "ModRules.h" #include "ModRules.h"
#include "AllAbilities.h" #include "AllAbilities.h"
#include "CardSelector.h"
#include <typeinfo> #include <typeinfo>
namespace namespace

2
projects/mtg/src/CardDisplay.cpp
View File

@@ -2,7 +2,7 @@
#include "CardDisplay.h" #include "CardDisplay.h"
#include "CardGui.h" #include "CardGui.h"
#include "CardSelectorSingleton.h" #include "CardSelector.h"
#include "TargetChooser.h" #include "TargetChooser.h"
#include "MTGGameZones.h" #include "MTGGameZones.h"
#include "GameObserver.h" #include "GameObserver.h"

2
projects/mtg/src/GuiAvatars.cpp
View File

@@ -1,6 +1,6 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "CardSelectorSingleton.h" #include "CardSelector.h"
#include "GameApp.h" #include "GameApp.h"
#include "GuiAvatars.h" #include "GuiAvatars.h"
#include "GameObserver.h" #include "GameObserver.h"

2
projects/mtg/src/GuiHand.cpp
View File

@@ -1,6 +1,6 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "CardSelectorSingleton.h" #include "CardSelector.h"
#include "CardSelector.h" #include "CardSelector.h"
#include "GameApp.h" #include "GameApp.h"
#include "Trash.h" #include "Trash.h"

2
projects/mtg/src/GuiPhaseBar.cpp
View File

@@ -4,7 +4,7 @@
#include "GuiPhaseBar.h" #include "GuiPhaseBar.h"
#include "GameObserver.h" #include "GameObserver.h"
#include "Translate.h" #include "Translate.h"
#include "CardSelectorSingleton.h" #include "CardSelector.h"
/* /*
static int colors[] = static int colors[] =

2
projects/mtg/src/GuiPlay.cpp
View File

@@ -1,6 +1,6 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "CardSelectorSingleton.h" #include "CardSelector.h"
#include "GameApp.h" #include "GameApp.h"
#include "GuiPlay.h" #include "GuiPlay.h"
#include "Subtypes.h" #include "Subtypes.h"

2
projects/mtg/src/MTGGameZones.cpp
View File

@@ -1,6 +1,6 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "CardSelectorSingleton.h" #include "CardSelector.h"
#include "MTGGameZones.h" #include "MTGGameZones.h"
#include "Player.h" #include "Player.h"
#include "WEvent.h" #include "WEvent.h"

2
projects/mtg/src/MTGRules.cpp
View File

@@ -1,6 +1,6 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "CardSelectorSingleton.h" #include "CardSelector.h"
#include "MTGRules.h" #include "MTGRules.h"
#include "Translate.h" #include "Translate.h"
#include "Subtypes.h" #include "Subtypes.h"