[Scummvm-cvs-logs] CVS: scummvm/simon simon.h,1.16,1.17

James Brown ender at users.sourceforge.net
Tue May 14 11:15:02 CEST 2002


Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv5220/simon

Modified Files:
	simon.h 
Log Message:
Remove SCUMM dependancies from SDL.C - This fixes a regular crash in Simon due to the autosaver.
This changes the OSystem interface. Porters beware.



Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- simon.h	5 May 2002 19:01:37 -0000	1.16
+++ simon.h	14 May 2002 18:14:16 -0000	1.17
@@ -47,11 +47,6 @@
 #define ARRAYSIZE(x) (sizeof(x)/sizeof(x[0]))
 #define CHECK_BOUNDS(x,y) assert((uint)(x)<ARRAYSIZE(y))
 
-enum {
-       CHILD1_SIZE = 12,
-       CHILD2_SIZE = 16
-};
-
 struct Child {
 	Child *next;
 	uint16 type;
@@ -87,6 +82,10 @@
 	uint16 a, b, c;
 };
 
+enum {
+    CHILD1_SIZE = sizeof(Child1) - sizeof(uint16),
+	CHILD2_SIZE = sizeof(Child2) - sizeof(int16)
+};
 
 struct Item {
 	uint16 parent;





More information about the Scummvm-git-logs mailing list