[Scummvm-cvs-logs] CVS: scummvm/bs2/driver _mouse.cpp,1.20,1.21 driver96.h,1.49,1.50

Max Horn fingolfin at users.sourceforge.net
Fri Oct 3 06:54:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv19874/driver

Modified Files:
	_mouse.cpp driver96.h 
Log Message:
use C++ struct naming instead of typedefs -> this fixes (or works around, whatever you prefer to call it) the GCC_PACK problem in Doxygen

Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_mouse.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- _mouse.cpp	28 Sep 2003 14:13:57 -0000	1.20
+++ _mouse.cpp	3 Oct 2003 13:53:46 -0000	1.21
@@ -31,7 +31,7 @@
 	#pragma START_PACK_STRUCTS
 #endif
 
-typedef struct {
+struct _mouseAnim {
 	uint8 runTimeComp;	// type of runtime compression used for the
 				// frame data
 	uint8 noAnimFrames;	// number of frames in the anim
@@ -39,7 +39,7 @@
 	int8 yHotSpot;
 	uint8 mousew;
 	uint8 mouseh;
-} GCC_PACK _mouseAnim;
+} GCC_PACK;
 
 #if !defined(__GNUC__)
 	#pragma END_PACK_STRUCTS

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- driver96.h	2 Oct 2003 17:43:01 -0000	1.49
+++ driver96.h	3 Oct 2003 13:53:46 -0000	1.50
@@ -243,11 +243,11 @@
 	#pragma START_PACK_STRUCTS
 #endif
 
-typedef struct {
+struct _parallax {
 	uint16 w;
 	uint16 h;
 	uint32 offset[2];	// 2 is arbitrary
-} GCC_PACK _parallax;
+} GCC_PACK;
 
 #if !defined(__GNUC__)
 	#pragma END_PACK_STRUCTS





More information about the Scummvm-git-logs mailing list