[Scummvm-cvs-logs] CVS: scummvm/bs2 header.h,1.2,1.3 resman.cpp,1.48,1.49 router.h,1.3,1.4
Max Horn
fingolfin at users.sourceforge.net
Fri Oct 3 06:55:03 CEST 2003
Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv19874
Modified Files:
header.h resman.cpp router.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: header.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/header.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- header.h 26 Sep 2003 10:07:18 -0000 1.2
+++ header.h 3 Oct 2003 13:53:45 -0000 1.3
@@ -38,7 +38,7 @@
#define NAME_LEN 34
-typedef struct {
+struct _standardHeader {
uint8 fileType; // Byte to define file type (see below)
uint8 compType; // Type of file compression used ie.
// on whole file (see below)
@@ -48,7 +48,7 @@
// memory (NB. frames still held
// compressed)
uint8 name[NAME_LEN]; // Name of object
-} GCC_PACK _standardHeader;
+} GCC_PACK;
//----------------------------------------------------------
// fileType
@@ -106,7 +106,7 @@
//----------------------------------------------------------
// Animation Header
-typedef struct {
+struct _animHeader {
uint8 runTimeComp; // Type of runtime compression used for the
// frame data (see below)
uint16 noAnimFrames; // Number of frames in the anim (ie. no. of
@@ -120,7 +120,7 @@
// place from the start)
uint8 feetEndDir; // Direction to start in after running anim
uint16 blend;
-} GCC_PACK _animHeader;
+} GCC_PACK;
//----------------------------------------------------------
// runtimeComp - compression used on each frame of the anim
@@ -135,7 +135,7 @@
//----------------------------------------------------------
// CDT Entry
-typedef struct {
+struct _cdtEntry {
int16 x; // sprite x-coord OR offset to add to mega's
// feet x-coord to calc sprite y-coord
int16 y; // sprite y-coord OR offset to add to mega's
@@ -144,7 +144,7 @@
// of file header)
uint8 frameType; // 0 = print sprite normally with top-left
// corner at (x,y), otherwise see below...
-} GCC_PACK _cdtEntry;
+} GCC_PACK;
// 'frameType' bit values
#define FRAME_OFFSET 1 // Print at (feetX + x, feetY + y), with
@@ -156,12 +156,12 @@
//----------------------------------------------------------
//Frame Header
-typedef struct {
+struct _frameHeader {
uint32 compSize; // Compressed size of frame - NB. compression
// type is now in Anim Header
uint16 width; // Dimensions of frame
uint16 height;
-} GCC_PACK _frameHeader;
+} GCC_PACK;
//----------------------------------------------------------
// (2) SCREEN FILES
@@ -183,7 +183,7 @@
// Goes at the beginning of a screen file after the standard header.
// Gives offsets from start of table of each of the components
-typedef struct {
+struct _multiScreenHeader {
uint32 palette;
uint32 bg_parallax[2];
uint32 screen;
@@ -191,26 +191,26 @@
uint32 layers;
uint32 paletteTable;
uint32 maskOffset;
-} GCC_PACK _multiScreenHeader;
+} GCC_PACK;
//------------------------------------------------------------
// Palette Data
-typedef struct {
+struct _palEntry {
uint8 red;
uint8 green;
uint8 blue;
uint8 alpha;
-} GCC_PACK _palEntry;
+} GCC_PACK;
//------------------------------------------------------------
// Screen Header
-typedef struct {
+struct _screenHeader {
uint16 width; // dimensions of the background screen
uint16 height;
uint16 noLayers; // number of layer areas
-} GCC_PACK _screenHeader;
+} GCC_PACK;
//------------------------------------------------------------
// Layer Header
@@ -219,7 +219,7 @@
// rather than being placed before each layer mask,
// in order to simplify the sort routine.
-typedef struct {
+struct _layerHeader {
uint16 x; // coordinates of top-left pixel of area
uint16 y;
uint16 width;
@@ -227,7 +227,7 @@
uint32 maskSize;
uint32 offset; // where to find mask data (from start of
// standard file header)
-} GCC_PACK _layerHeader;
+} GCC_PACK;
//----------------------------------------------------------
// (3) SCRIPT OBJECT FILES
@@ -250,10 +250,10 @@
//----------------------------------------------------------
// Walk-Grid Header - taken directly from old "header.h" in STD_INC
-typedef struct {
+struct _walkGridHeader {
int32 numBars; // number of bars on the floor
int32 numNodes; // number of nodes
-} GCC_PACK _walkGridHeader;
+} GCC_PACK;
//----------------------------------------------------------
// (5) PALETTE FILES
@@ -270,20 +270,20 @@
#define TREE_SIZE 3
-typedef struct {
+struct _object_hub {
int32 type; // type of object
uint32 logic_level; // what level?
uint32 logic[TREE_SIZE]; // NOT USED
uint32 script_id[TREE_SIZE]; // need this if script
uint32 script_pc[TREE_SIZE]; // need this also
-} GCC_PACK _object_hub;
+} GCC_PACK;
// (6) text module header
-typedef struct {
+struct _textHeader {
uint32 noOfLines; // how many lines of text are there in this
// module
-} GCC_PACK _textHeader;
+} GCC_PACK;
// a text file has:
//
Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- resman.cpp 3 Oct 2003 06:54:44 -0000 1.48
+++ resman.cpp 3 Oct 2003 13:53:45 -0000 1.49
@@ -79,10 +79,10 @@
#pragma START_PACK_STRUCTS
#endif
-typedef struct {
+struct _cd_inf {
uint8 clusterName[20]; // Null terminated cluster name.
uint8 cd; // Cd cluster is on and whether it is on the local drive or not.
-} GCC_PACK _cd_inf;
+} GCC_PACK;
#if !defined(__GNUC__)
#pragma END_PACK_STRUCTS
Index: router.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/router.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- router.h 20 Sep 2003 15:34:53 -0000 1.3
+++ router.h 3 Oct 2003 13:53:45 -0000 1.4
@@ -27,15 +27,15 @@
#pragma START_PACK_STRUCTS
#endif
-typedef struct _walkData {
+struct _walkData {
uint16 frame;
int16 x;
int16 y;
uint8 step;
uint8 dir;
-} GCC_PACK _walkData;
+} GCC_PACK;
-typedef struct {
+struct _barData {
int16 x1;
int16 y1;
int16 x2;
@@ -47,15 +47,15 @@
int16 dx; // x2 - x1
int16 dy; // y2 - y1
int32 co; // co = (y1 *dx)- (x1*dy) from an equation for a line y*dx = x*dy + co
-} GCC_PACK _barData;
+} GCC_PACK;
-typedef struct {
+struct _nodeData {
int16 x;
int16 y;
int16 level;
int16 prev;
int16 dist;
-} GCC_PACK _nodeData;
+} GCC_PACK;
#if !defined(__GNUC__)
#pragma END_PACK_STRUCTS
More information about the Scummvm-git-logs
mailing list