[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.20,1.21 simon.h,1.12,1.13
James Brown
ender at users.sourceforge.net
Fri Apr 19 21:10:02 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm Makefile.irix,NONE,1.1 boxes.cpp,1.24,1.25 gfx.cpp,1.72,1.73 object.cpp,1.59,1.60 saveload.cpp,1.40,1.41 script_v1.cpp,1.85,1.86 script_v2.cpp,1.45,1.46 scumm.h,1.130,1.131 scummsys.h,1.28,1.29 scummvm.cpp,1.119,1.120
- Next message: [Scummvm-cvs-logs] CVS: scummvm/v4 resource_v4.cpp,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv23320/simon
Modified Files:
simon.cpp simon.h
Log Message:
Remove \M's, add IRIX support.
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** simon.cpp 19 Apr 2002 11:12:27 -0000 1.20
--- simon.cpp 20 Apr 2002 04:09:02 -0000 1.21
***************
*** 303,307 ****
Child1 *child;
! size = sizeof(Child1);
for(i=0,j=fr2; i!=6; i++, j>>=2)
if (j&3)
--- 303,307 ----
Child1 *child;
! size = CHILD1_SIZE;
for(i=0,j=fr2; i!=6; i++, j>>=2)
if (j&3)
***************
*** 320,324 ****
Child2 *child;
! size = sizeof(Child2);
for(i=0; i!=16; i++)
if (fr & (1<<i))
--- 320,324 ----
Child2 *child;
! size = CHILD2_SIZE;
for(i=0; i!=16; i++)
if (fr & (1<<i))
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** simon.h 16 Apr 2002 23:15:58 -0000 1.12
--- simon.h 20 Apr 2002 04:09:02 -0000 1.13
***************
*** 48,55 ****
#define CHECK_BOUNDS(x,y) assert((uint)(x)<ARRAYSIZE(y))
! #ifdef WIN32
! /* don't complain about zero sized arrays */
! #pragma warning (disable: 4200)
! #endif
struct Child {
--- 48,55 ----
#define CHECK_BOUNDS(x,y) assert((uint)(x)<ARRAYSIZE(y))
! enum {
! CHILD1_SIZE = 12,
! CHILD2_SIZE = 16
! };
struct Child {
***************
*** 63,67 ****
uint16 string_id;
uint32 avail_props;
! int16 array[0];
};
--- 63,67 ----
uint16 string_id;
uint32 avail_props;
! int16 array[1];
};
***************
*** 71,75 ****
uint16 subroutine_id;
uint16 fr2;
! uint16 array[0];
};
--- 71,75 ----
uint16 subroutine_id;
uint16 fr2;
! uint16 array[1];
};
- Previous message: [Scummvm-cvs-logs] CVS: scummvm Makefile.irix,NONE,1.1 boxes.cpp,1.24,1.25 gfx.cpp,1.72,1.73 object.cpp,1.59,1.60 saveload.cpp,1.40,1.41 script_v1.cpp,1.85,1.86 script_v2.cpp,1.45,1.46 scumm.h,1.130,1.131 scummsys.h,1.28,1.29 scummvm.cpp,1.119,1.120
- Next message: [Scummvm-cvs-logs] CVS: scummvm/v4 resource_v4.cpp,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list