diff options
| author | Lars Persson | 2006-02-12 00:33:04 +0000 |
|---|---|---|
| committer | Lars Persson | 2006-02-12 00:33:04 +0000 |
| commit | 0b847325e1b57ad2feec943ae715236cf393d13b (patch) | |
| tree | fe75e08da4d3967125f8706bbe520d5f66e69e85 /common | |
| parent | 37f433a7ad516df85cd62e32e1a178635212b047 (diff) | |
| download | scummvm-rg350-0b847325e1b57ad2feec943ae715236cf393d13b.tar.gz scummvm-rg350-0b847325e1b57ad2feec943ae715236cf393d13b.tar.bz2 scummvm-rg350-0b847325e1b57ad2feec943ae715236cf393d13b.zip | |
'Changed Symbian configuration handling so it is using the basepath of the application installation as a path for Savegames, ini files etc
*Updated list.h so it also compiles for Symbian codewarrior and gcce compilers
svn-id: r20586
Diffstat (limited to 'common')
| -rw-r--r-- | common/config-manager.cpp | 3 | ||||
| -rw-r--r-- | common/list.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 128db8035b..ee49a4babf 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -109,7 +109,8 @@ void ConfigManager::loadDefaultConfigFile() { #elif defined(__PSP__) strcpy(configFile, "ms0:/" DEFAULT_CONFIG_FILE); #elif defined (__SYMBIAN32__) - strcpy(configFile, SYMBIAN32_DOC_DIR DEFAULT_CONFIG_FILE); + strcpy(configFile, Symbian::GetExecutablePath()); + strcat(configFile, DEFAULT_CONFIG_FILE); #else strcpy(configFile, DEFAULT_CONFIG_FILE); #endif diff --git a/common/list.h b/common/list.h index 8fb59a12a9..6d93636798 100644 --- a/common/list.h +++ b/common/list.h @@ -55,7 +55,7 @@ public: friend class List<T>; NodeBase *_node; -#ifndef PALMOS_MODE +#if !defined (PALMOS_MODE) && !defined (__WINSCW__) explicit Iterator<T2>(NodeBase *node) : _node(node) {} #else Iterator<T2>(NodeBase *node) : _node(node) {} @@ -72,7 +72,7 @@ public: } // Postfix inc Iterator<T2> operator++(int) { -#ifndef PALMOS_MODE +#if !defined (PALMOS_MODE) && !defined (__SYMBIAN32__) Iterator<T2> tmp(_node); #else Iterator tmp(_node); |