[Scummvm-cvs-logs] CVS: scummvm/sword1 control.cpp,1.65,1.66 credits.cpp,1.17,1.18 sound.h,1.24,1.25 staticres.cpp,1.13,1.14 sword1.cpp,1.96,1.97

[Chris Apers]

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

Modified Files:
	control.cpp credits.cpp sound.h staticres.cpp sword1.cpp 
Log Message:
PalmOS ifdef

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- control.cpp	26 Oct 2005 06:37:09 -0000	1.65
+++ control.cpp	5 Nov 2005 19:26:26 -0000	1.66
@@ -1066,7 +1066,7 @@
 			case OSystem::EVENT_LBUTTONDOWN:
 				_mouseDown = true;
 				_mouseState |= BS1L_BUTTON_DOWN;
-#if defined(_WIN32_WCE) || defined(__PALM_OS__)
+#if defined(_WIN32_WCE) || defined(PALMOS_MODE)
 				_mouseX = event.mouse.x;
 				_mouseY = event.mouse.y;
 #endif
@@ -1094,9 +1094,8 @@
 			_keyRepeatTime += kKeyRepeatSustainDelay;
 			_keyPressed = _keyRepeat;
 		}
-#ifndef __PALM_OS__
+
 		_system->delayMillis(10);
-#endif
 	} while (_system->getMillis() < endTime);
 }
 
@@ -1293,4 +1292,3 @@
 };
 
 } // End of namespace Sword1
-

Index: credits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/credits.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- credits.cpp	18 Oct 2005 01:30:24 -0000	1.17
+++ credits.cpp	5 Nov 2005 19:26:26 -0000	1.18
@@ -286,10 +286,9 @@
 			}
 		}
 
-#ifndef __PALM_OS__
 		if (msecs > 0)
 			_system->delayMillis(10);
-#endif
+
 	} while ((_system->getMillis() < start + msecs) && !SwordEngine::_systemVars.engineQuit);
 }
 

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- sound.h	18 Oct 2005 01:30:24 -0000	1.24
+++ sound.h	5 Nov 2005 19:26:26 -0000	1.25
@@ -113,7 +113,7 @@
 	char _filePath[100];
 	static const char _musicList[270];
 	static const uint16 _roomsFixedFx[TOTAL_ROOMS][TOTAL_FX_PER_ROOM];
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 public:
 	static const FxDef *_fxList;
 #else

Index: staticres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/staticres.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- staticres.cpp	18 Oct 2005 01:30:24 -0000	1.13
+++ staticres.cpp	5 Nov 2005 19:26:26 -0000	1.14
@@ -2890,7 +2890,7 @@
 	"rm3d",		// DONE 269 ONe the scene change after the Grand Master says, "George, we have watched you..." This one might need a bit of fiddling to get it to match to the fisticuffs.
 };
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 const FxDef *Sound::_fxList;
 #else
 const FxDef Sound::_fxList[312] = {
@@ -7153,7 +7153,7 @@
 
 } // End of namespace Sword1
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 #include "scumm_globals.h"
 
 _GINIT(Sword1_fxList)

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- sword1.cpp	23 Oct 2005 10:03:27 -0000	1.96
+++ sword1.cpp	5 Nov 2005 19:26:26 -0000	1.97
@@ -579,14 +579,14 @@
 				break;
 			case OSystem::EVENT_LBUTTONDOWN:
 				_mouseState |= BS1L_BUTTON_DOWN;
-#if defined(_WIN32_WCE) || defined(__PALM_OS__)
+#if defined(_WIN32_WCE) || defined(PALMOS_MODE)
 				_mouseX = event.mouse.x;
 				_mouseY = event.mouse.y;
 #endif
 				break;
 			case OSystem::EVENT_RBUTTONDOWN:
 				_mouseState |= BS1R_BUTTON_DOWN;
-#if defined(_WIN32_WCE) || defined(__PALM_OS__)
+#if defined(_WIN32_WCE) || defined(PALMOS_MODE)
 				_mouseX = event.mouse.x;
 				_mouseY = event.mouse.y;
 #endif