aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Apers2005-11-05 18:51:12 +0000
committerChris Apers2005-11-05 18:51:12 +0000
commit54c47e3985f638caf34eaf432aa19e55fe91a74c (patch)
treea193acdebc490bee2d86c7e20a09f838b82ecccf
parentaf1cbcde851711b627a1f846383d6a1e92e639f0 (diff)
downloadscummvm-rg350-54c47e3985f638caf34eaf432aa19e55fe91a74c.tar.gz
scummvm-rg350-54c47e3985f638caf34eaf432aa19e55fe91a74c.tar.bz2
scummvm-rg350-54c47e3985f638caf34eaf432aa19e55fe91a74c.zip
PalmOS ifdef
svn-id: r19472
-rw-r--r--simon/charset.cpp4
-rw-r--r--simon/cursor.cpp4
-rw-r--r--simon/debug.cpp4
-rw-r--r--simon/intern.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/simon/charset.cpp b/simon/charset.cpp
index f4304a1ce0..d9a285f103 100644
--- a/simon/charset.cpp
+++ b/simon/charset.cpp
@@ -369,7 +369,7 @@ void SimonEngine::video_putchar_newline(FillOrCopyStruct *fcs) {
fcs->textRow++;
}
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
static const byte *russian_video_font;
static const byte *french_video_font;
static const byte *german_video_font;
@@ -1132,7 +1132,7 @@ void SimonEngine::video_putchar_drawchar(FillOrCopyStruct *fcs, uint x, uint y,
} // End of namespace Simon
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(Simon_Charset)
diff --git a/simon/cursor.cpp b/simon/cursor.cpp
index 1827acf784..72e273d6a2 100644
--- a/simon/cursor.cpp
+++ b/simon/cursor.cpp
@@ -27,7 +27,7 @@
namespace Simon {
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
static const byte *_simon1_cursor;
#else
static const byte _simon1_cursor[256] = {
@@ -231,7 +231,7 @@ void SimonEngine::draw_mouse_pointer() {
} // End of namespace Simon
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(Simon_Cursor)
diff --git a/simon/debug.cpp b/simon/debug.cpp
index bdebea7e9d..749a83d7b0 100644
--- a/simon/debug.cpp
+++ b/simon/debug.cpp
@@ -356,7 +356,7 @@ static void dump_bitmap(const char *filename, const byte *offs, int w, int h, in
void SimonEngine::dump_single_bitmap(int file, int image, const byte *offs, int w, int h, byte base) {
char buf[40];
-#if !defined(__PALM_OS__) && !defined(__DC__) && !defined(__PSP__)
+#if !defined(PALMOS_MODE) && !defined(__DC__) && !defined(__PSP__)
struct stat statbuf;
#endif
@@ -366,7 +366,7 @@ void SimonEngine::dump_single_bitmap(int file, int image, const byte *offs, int
sprintf(buf, "dumps/File%d_Image%d.bmp", file, image);
#endif
-#if !defined(__PALM_OS__) && !defined(__DC__) && !defined(__PSP__)
+#if !defined(PALMOS_MODE) && !defined(__DC__) && !defined(__PSP__)
if (stat(buf, &statbuf) == 0)
return;
#endif
diff --git a/simon/intern.h b/simon/intern.h
index 279f66127b..3a4bd840fb 100644
--- a/simon/intern.h
+++ b/simon/intern.h
@@ -118,7 +118,7 @@ struct TimeEvent {
};
struct GameSpecificSettings {
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
const char *gme_filename;
const char *wav_filename;
const char *voc_filename;