aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/cruise/cruise.cpp4
-rw-r--r--engines/cruise/vars.cpp4
-rw-r--r--engines/cruise/vars.h5
-rw-r--r--engines/queen/resource.cpp11
-rw-r--r--engines/sword1/memman.h4
-rw-r--r--engines/sword2/resman.h4
6 files changed, 0 insertions, 32 deletions
diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp
index e6d0359059..2f38aa98ba 100644
--- a/engines/cruise/cruise.cpp
+++ b/engines/cruise/cruise.cpp
@@ -52,10 +52,6 @@ CruiseEngine *_vm;
CruiseEngine::CruiseEngine(OSystem * syst, const CRUISEGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
-#ifdef PALMOS_MODE
- _currentVolumeFile = new Common::File();
-#endif
-
DebugMan.addDebugChannel(kCruiseDebugScript, "scripts", "Scripts debug level");
DebugMan.addDebugChannel(kCruiseDebugSound, "sound", "Sound debug level");
diff --git a/engines/cruise/vars.cpp b/engines/cruise/vars.cpp
index 94fd00cbfd..bab5d171fd 100644
--- a/engines/cruise/vars.cpp
+++ b/engines/cruise/vars.cpp
@@ -64,11 +64,7 @@ int16 autoTrack;
int16 currentDiskNumber = 1;
-#ifdef PALMOS_MODE
-Common::File *_currentVolumeFile;
-#else
Common::File currentVolumeFile;
-#endif
int16 volumeNumEntry;
fileEntry *volumePtrToFileDescriptor = NULL;
diff --git a/engines/cruise/vars.h b/engines/cruise/vars.h
index 1e19794f3a..3cb09602cc 100644
--- a/engines/cruise/vars.h
+++ b/engines/cruise/vars.h
@@ -167,12 +167,7 @@ extern int16 autoTrack;
extern int16 currentDiskNumber;
-#ifdef PALMOS_MODE
-extern Common::File *_currentVolumeFile;
-#define currentVolumeFile (*_currentVolumeFile)
-#else
extern Common::File currentVolumeFile;
-#endif
extern int16 volumeNumEntry;
extern fileEntry *volumePtrToFileDescriptor;
diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp
index a43141ef56..1e2eff8458 100644
--- a/engines/queen/resource.cpp
+++ b/engines/queen/resource.cpp
@@ -96,18 +96,7 @@ ResourceEntry *Resource::resourceEntry(const char *filename) const {
entryName.toUppercase();
ResourceEntry *re = NULL;
-#ifndef PALMOS_MODE
re = (ResourceEntry *)bsearch(entryName.c_str(), _resourceTable, _resourceEntries, sizeof(ResourceEntry), compareResourceEntry);
-#else
- // PALMOS FIXME (?) : still doesn't work for me (????) use this instead
- uint32 cur = 0;
- do {
- if (!strcmp(entryName.c_str(), _resourceTable[cur].filename)) {
- re = &_resourceTable[cur];
- break;
- }
- } while (++cur < _resourceEntries);
-#endif
return re;
}
diff --git a/engines/sword1/memman.h b/engines/sword1/memman.h
index 845a8638a2..b489eae2f9 100644
--- a/engines/sword1/memman.h
+++ b/engines/sword1/memman.h
@@ -42,11 +42,7 @@ struct MemHandle {
#define MEM_CAN_FREE 1
#define MEM_DONT_FREE 2
-#ifdef PALMOS_MODE
-#define MAX_ALLOC (3*1024*1024) // max amount of mem we want to alloc().
-#else
#define MAX_ALLOC (6*1024*1024) // max amount of mem we want to alloc().
-#endif
class MemMan {
public:
diff --git a/engines/sword2/resman.h b/engines/sword2/resman.h
index 72bdf73b98..dcc79927ea 100644
--- a/engines/sword2/resman.h
+++ b/engines/sword2/resman.h
@@ -32,11 +32,7 @@ namespace Common {
class File;
}
-#ifdef PALMOS_MODE
-#define MAX_MEM_CACHE (4 * 1024 * 1024) // 4 seems to be enough, 8 = out of memory
-#else
#define MAX_MEM_CACHE (8 * 1024 * 1024) // we keep up to 8 megs of resource data files in memory
-#endif
#define MAX_res_files 20
namespace Sword2 {