[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.42,1.43 cursor.cpp,1.9,1.10 debug.cpp,1.44,1.45 intern.h,1.41,1.42

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23494

Modified Files:
	charset.cpp cursor.cpp debug.cpp intern.h 
Log Message:
PalmOS ifdef

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- charset.cpp	2 Nov 2005 07:50:45 -0000	1.42
+++ charset.cpp	5 Nov 2005 18:51:12 -0000	1.43
@@ -369,7 +369,7 @@
 		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 @@
 
 } // End of namespace Simon
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 #include "scumm_globals.h"
 
 _GINIT(Simon_Charset)

Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/cursor.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cursor.cpp	18 Oct 2005 01:30:22 -0000	1.9
+++ cursor.cpp	5 Nov 2005 18:51:12 -0000	1.10
@@ -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 @@
 
 } // End of namespace Simon
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 #include "scumm_globals.h"
 
 _GINIT(Simon_Cursor)

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- debug.cpp	18 Oct 2005 01:30:22 -0000	1.44
+++ debug.cpp	5 Nov 2005 18:51:12 -0000	1.45
@@ -356,7 +356,7 @@
 
 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 @@
 	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

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- intern.h	19 Oct 2005 10:54:22 -0000	1.41
+++ intern.h	5 Nov 2005 18:51:12 -0000	1.42
@@ -118,7 +118,7 @@
 };
 
 struct GameSpecificSettings {
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
 	const char *gme_filename;
 	const char *wav_filename;
 	const char *voc_filename;