[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.47,1.48 guimaps.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm readme.txt,1.59,1.60 script_v1.cpp,1.107,1.108 scumm.h,1.159,1.160 scummvm.cpp,1.150,1.151 sdl.cpp,1.120,1.121 sound.cpp,1.86,1.87 system.h,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.47,1.48 guimaps.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm readme.txt,1.59,1.60 script_v1.cpp,1.107,1.108 scumm.h,1.159,1.160 scummvm.cpp,1.150,1.151 sdl.cpp,1.120,1.121 sound.cpp,1.86,1.87 system.h,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list