[Scummvm-cvs-logs] CVS: scummvm/simon cursor.cpp,1.1.2.1,1.1.2.2 simon.cpp,1.472.2.3,1.472.2.4

[Chris Apers]

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

Modified Files:
      Tag: branch-0-7-0
	cursor.cpp simon.cpp 
Log Message:
Move this too

Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/cursor.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- cursor.cpp	16 Dec 2004 12:35:38 -0000	1.1.2.1
+++ cursor.cpp	20 Dec 2004 18:28:53 -0000	1.1.2.2
@@ -229,3 +229,16 @@
 }
 
 } // End of namespace Simon
+
+#ifdef __PALM_OS__
+#include "scumm_globals.h"
+
+_GINIT(Simon_Cursor)
+_GSETPTR(Simon::_simon1_cursor, GBVARS_SIMON1CURSOR_INDEX, byte, GBVARS_SIMON)
+_GEND
+
+_GRELEASE(Simon_Cursor)
+_GRELEASEPTR(GBVARS_SIMON1CURSOR_INDEX, GBVARS_SIMON)
+_GEND
+
+#endif

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.472.2.3
retrieving revision 1.472.2.4
diff -u -d -r1.472.2.3 -r1.472.2.4
--- simon.cpp	17 Dec 2004 07:54:15 -0000	1.472.2.3
+++ simon.cpp	20 Dec 2004 18:28:53 -0000	1.472.2.4
@@ -4198,7 +4198,6 @@
 _GSETPTR(Simon::simon1demo_settings, GBVARS_SIMON1DEMOSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON)
 _GSETPTR(Simon::simon2win_settings, GBVARS_SIMON2WINSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON)
 _GSETPTR(Simon::simon2dos_settings, GBVARS_SIMON2DOSSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON)
-_GSETPTR(Simon::_simon1_cursor, GBVARS_SIMON1CURSOR_INDEX, byte, GBVARS_SIMON)
 _GEND
 
 _GRELEASE(Simon_Simon)
@@ -4208,7 +4207,6 @@
 _GRELEASEPTR(GBVARS_SIMON1DEMOSETTINGS_INDEX, GBVARS_SIMON)
 _GRELEASEPTR(GBVARS_SIMON2WINSETTINGS_INDEX, GBVARS_SIMON)
 _GRELEASEPTR(GBVARS_SIMON2DOSSETTINGS_INDEX, GBVARS_SIMON)
-_GRELEASEPTR(GBVARS_SIMON1CURSOR_INDEX, GBVARS_SIMON)
 _GEND
 
 #endif