[Scummvm-cvs-logs] SF.net SVN: scummvm: [23569] scummvm/trunk/sound

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Jul 22 19:29:30 CEST 2006


Revision: 23569
Author:   fingolfin
Date:     2006-07-22 10:28:48 -0700 (Sat, 22 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23569&view=rev

Log Message:
-----------
Fix struct packing issues (macros are not resolve in #pragma params, at least for GCC)

Modified Paths:
--------------
    scummvm/trunk/common/scummsys.h
    scummvm/trunk/engines/gob/game.h
    scummvm/trunk/engines/gob/goblin.h
    scummvm/trunk/engines/gob/map.h
    scummvm/trunk/engines/gob/mult.h
    scummvm/trunk/engines/gob/scenery.h
    scummvm/trunk/engines/gob/video.h
    scummvm/trunk/engines/lure/res_struct.h
    scummvm/trunk/engines/queen/queen.h
    scummvm/trunk/engines/saga/gfx.h
    scummvm/trunk/engines/scumm/akos.cpp
    scummvm/trunk/engines/scumm/base-costume.h
    scummvm/trunk/engines/scumm/boxes.cpp
    scummvm/trunk/engines/scumm/file.cpp
    scummvm/trunk/engines/scumm/he/intern_he.h
    scummvm/trunk/engines/scumm/he/resource_he.h
    scummvm/trunk/engines/scumm/intern.h
    scummvm/trunk/engines/scumm/object.cpp
    scummvm/trunk/engines/scumm/object.h
    scummvm/trunk/engines/scumm/player_v2.h
    scummvm/trunk/engines/scumm/saveload.cpp
    scummvm/trunk/engines/scumm/thumbnail.cpp
    scummvm/trunk/engines/simon/vga.h
    scummvm/trunk/engines/sky/sound.cpp
    scummvm/trunk/engines/sky/struc.h
    scummvm/trunk/engines/sword1/mouse.h
    scummvm/trunk/engines/sword1/object.h
    scummvm/trunk/engines/sword1/router.h
    scummvm/trunk/engines/sword1/sworddefs.h
    scummvm/trunk/sound/voc.h

Added Paths:
-----------
    scummvm/trunk/common/pack-end.h
    scummvm/trunk/common/pack-start.h
Added: scummvm/trunk/common/pack-end.h
===================================================================
--- scummvm/trunk/common/pack-end.h	                        (rev 0)
+++ scummvm/trunk/common/pack-end.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -0,0 +1,24 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002-2006 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#if defined(SCUMMVM_USE_PRAGMA_PACK)
+  #pragma pack()
+#endif


Property changes on: scummvm/trunk/common/pack-end.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Date Rev Author URL Id
Name: svn:eol-style
   + native

Added: scummvm/trunk/common/pack-start.h
===================================================================
--- scummvm/trunk/common/pack-start.h	                        (rev 0)
+++ scummvm/trunk/common/pack-start.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -0,0 +1,24 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002-2006 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#if defined(SCUMMVM_USE_PRAGMA_PACK)
+  #pragma pack(1)
+#endif


Property changes on: scummvm/trunk/common/pack-start.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Date Rev Author URL Id
Name: svn:eol-style
   + native

Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/common/scummsys.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -73,15 +73,15 @@
 //
 // By default we try to use pragma push/pop to ensure various structs we use
 // are "packed". If your compiler doesn't support this pragma, you are in for 
-// a problem. If you are lucky, an equivalent pragma is available, in which
-// case you can redefine these two macros appropriately. Or maybe your port
-// simply *always* packs everything, in which case you could #undefine them.
+// a problem. If you are lucky, there is a compiler switch, or another pragma,
+// doing the same thing -- in that case, try to modify common/pack-begin.h and
+// common/pack-end.h accordingly. Or maybe your port simply *always* packs
+// everything, in which case you could #undefine SCUMMVM_USE_PRAGMA_PACK.
 //
 // If neither is possible, tough luck. Try to contact the team, maybe we can
 // come up with a solution, though I wouldn't hold my breath on it :-/.
 //
-#define START_PACK_STRUCTS pack(push, 1)
-#define END_PACK_STRUCTS   pack(pop)
+#define SCUMMVM_USE_PRAGMA_PACK
 
 
 #if defined(_MSC_VER) && !defined(__SYMBIAN32__) && !defined(_WIN32_WCE)

Modified: scummvm/trunk/engines/gob/game.h
===================================================================
--- scummvm/trunk/engines/gob/game.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/gob/game.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -31,9 +31,7 @@
 class Game {
 public:
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 	struct Collision {
 		int16 id;
@@ -131,9 +129,7 @@
 		int32 vidBufferSize;
 	};
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 	TotResTable *_totResourceTable;
 	Collision *_collisionAreas;

Modified: scummvm/trunk/engines/gob/goblin.h
===================================================================
--- scummvm/trunk/engines/gob/goblin.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/gob/goblin.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -38,9 +38,7 @@
 
 public:
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 	struct Gob_State {
 		int16 animation;// +0h
@@ -97,9 +95,7 @@
 		char y;
 	};
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 	Util::List *_objList;
 	Gob_Object *_goblins[4];

Modified: scummvm/trunk/engines/gob/map.h
===================================================================
--- scummvm/trunk/engines/gob/map.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/gob/map.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -43,9 +43,7 @@
 		kDirSE = 0x5100
 	};
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 	struct Point {
 		int16 x;
@@ -61,9 +59,7 @@
 		int8 orient;		// ??
 	};
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 	int16 _mapWidth;
 	int16 _mapHeight;

Modified: scummvm/trunk/engines/gob/mult.h
===================================================================
--- scummvm/trunk/engines/gob/mult.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/gob/mult.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -32,9 +32,7 @@
 class Mult {
 public:
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 	struct Mult_AnimData {
 		int8 animation;
@@ -160,9 +158,7 @@
 		int16 field_E;
 	};
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 	// Globals
 
@@ -295,7 +291,9 @@
 
 class Mult_v2 : public Mult_v1 {
 public:
-#pragma START_PACK_STRUCTS
+
+#include <common/pack-start.h>	// START STRUCT PACKING
+
 	struct Mult_Data {
 		int16 palFadeKeysCount;
 		Mult_PalFadeKey *palFadeKeys;
@@ -345,8 +343,9 @@
 		char *somepointer10; // ?
 		char *execPtr;
 	};
-#pragma END_PACK_STRUCTS
 
+#include <common/pack-end.h>	// END STRUCT PACKING
+
 	Mult_Data *_multData2; // TODO: This'll be _multData once every function using it
 	                       //       in GOB2 is done
 												 // TODO: Maybe changing Mult_v1::_multData to struct Mult_Data as well?

Modified: scummvm/trunk/engines/gob/scenery.h
===================================================================
--- scummvm/trunk/engines/gob/scenery.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/gob/scenery.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -28,9 +28,7 @@
 class Scenery {
 public:
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 	struct PieceDesc {
 		int16 left;		//NOTE:
@@ -75,9 +73,7 @@
 		AnimFramePiece *frames;
 	};
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 	struct Static {
 		int16 layersCount;

Modified: scummvm/trunk/engines/gob/video.h
===================================================================
--- scummvm/trunk/engines/gob/video.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/gob/video.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -73,9 +73,7 @@
 #define DISABLE_SPR_ALLOC	0x20
 #define SCUMMVM_CURSOR		0x100
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 	struct Color {
 		byte red;
@@ -83,9 +81,7 @@
 		byte blue;
 	};
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 	struct PalDesc {
 		Color *vgaPal;

Modified: scummvm/trunk/engines/lure/res_struct.h
===================================================================
--- scummvm/trunk/engines/lure/res_struct.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/lure/res_struct.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -37,9 +37,7 @@
 /*                                                                         */
 /*-------------------------------------------------------------------------*/
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct VersionStructure {
 	uint16 id;
@@ -215,9 +213,7 @@
 	uint16 hotspotId;
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 // Class template for a derived list that destroys the contained
 // object when the record containing it is destroyed. It's not

Modified: scummvm/trunk/engines/queen/queen.h
===================================================================
--- scummvm/trunk/engines/queen/queen.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/queen/queen.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -49,9 +49,7 @@
 
 namespace Queen {
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct GameStateHeader {
 	uint32 version;
@@ -60,9 +58,7 @@
 	char description[32];
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 class BamScene;
 class BankManager;

Modified: scummvm/trunk/engines/saga/gfx.h
===================================================================
--- scummvm/trunk/engines/saga/gfx.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/saga/gfx.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -78,9 +78,7 @@
 	}
 };
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct PalEntry {
 	byte red;
@@ -88,9 +86,7 @@
 	byte blue;
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 struct Color {
 	int red;

Modified: scummvm/trunk/engines/scumm/akos.cpp
===================================================================
--- scummvm/trunk/engines/scumm/akos.cpp	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/akos.cpp	2006-07-22 17:28:48 UTC (rev 23569)
@@ -36,9 +36,7 @@
 
 namespace Scumm {
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct AkosHeader {
 	byte unk_1[2];
@@ -54,9 +52,7 @@
 	uint16 akci;
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 
 enum AkosOpcodes {

Modified: scummvm/trunk/engines/scumm/base-costume.h
===================================================================
--- scummvm/trunk/engines/scumm/base-costume.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/base-costume.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -29,9 +29,7 @@
 
 namespace Scumm {
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct CostumeInfo {
 	uint16 width, height;
@@ -39,9 +37,7 @@
 	int16 move_x, move_y;
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 
 

Modified: scummvm/trunk/engines/scumm/boxes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/boxes.cpp	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/boxes.cpp	2006-07-22 17:28:48 UTC (rev 23569)
@@ -31,9 +31,7 @@
 
 namespace Scumm {
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct Box {				/* Internal walkbox file format */
 	union {
@@ -81,9 +79,7 @@
 	};
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 #define BOX_MATRIX_SIZE 2000
 #define BOX_DEBUG 0

Modified: scummvm/trunk/engines/scumm/file.cpp
===================================================================
--- scummvm/trunk/engines/scumm/file.cpp	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/file.cpp	2006-07-22 17:28:48 UTC (rev 23569)
@@ -1241,9 +1241,7 @@
 	{ -1, NULL }
 };
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct _lfl_index {
 	byte	room_lfl[55];
@@ -1256,9 +1254,7 @@
 	uint16	sound_addr[100];
 } lfl_index;
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 
 bool ScummNESFile::generateResource(int res) {

Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/he/intern_he.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -226,9 +226,7 @@
 		const char *desc;
 	};
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 	struct ArrayHeader {
 		int32 type;      //0
@@ -239,9 +237,7 @@
 		byte data[1];    //14
 	};
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 	const OpcodeEntryV72he *_opcodesV72he;
 

Modified: scummvm/trunk/engines/scumm/he/resource_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/resource_he.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/he/resource_he.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -172,9 +172,7 @@
  * Structures
  */
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 	struct WinLibrary {
 		Common::File *file;
@@ -456,9 +454,7 @@
 		uint16 number_of_id_entries;
 	};
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 /*
  * Function Prototypes

Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/intern.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -519,9 +519,7 @@
 		kDwordArray = 6
 	};
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 	struct ArrayHeader {
 		int16 dim1;
@@ -530,9 +528,7 @@
 		byte data[1];
 	};
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 	const OpcodeEntryV6 *_opcodesV6;
 

Modified: scummvm/trunk/engines/scumm/object.cpp
===================================================================
--- scummvm/trunk/engines/scumm/object.cpp	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/object.cpp	2006-07-22 17:28:48 UTC (rev 23569)
@@ -36,9 +36,7 @@
 
 namespace Scumm {
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct BompHeader {			/* Bomp header */
 	union {
@@ -53,9 +51,7 @@
 	};
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 
 bool ScummEngine::getClass(int obj, int cls) const {

Modified: scummvm/trunk/engines/scumm/object.h
===================================================================
--- scummvm/trunk/engines/scumm/object.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/object.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -51,9 +51,7 @@
 	byte flags;
 };
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct RoomHeader {
 	union {
@@ -159,9 +157,7 @@
 	};
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 struct FindObjectInRoom {
 	const CodeHeader *cdhd;

Modified: scummvm/trunk/engines/scumm/player_v2.h
===================================================================
--- scummvm/trunk/engines/scumm/player_v2.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/player_v2.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -37,9 +37,7 @@
 
 class ScummEngine;
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct channel_data {
 	uint16 time_left;          // 00
@@ -66,9 +64,7 @@
 	uint16 music_script_nr;    // 48
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 
 /**

Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2006-07-22 17:28:48 UTC (rev 23569)
@@ -53,9 +53,7 @@
 	char name[32];
 };
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct SaveInfoSection {
 	uint32 type;
@@ -71,9 +69,7 @@
 
 #define SaveInfoSectionSize (4+4+4 + 4+4 + 4+2)
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 #define INFOSECTION_VERSION 2
 

Modified: scummvm/trunk/engines/scumm/thumbnail.cpp
===================================================================
--- scummvm/trunk/engines/scumm/thumbnail.cpp	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/scumm/thumbnail.cpp	2006-07-22 17:28:48 UTC (rev 23569)
@@ -31,9 +31,7 @@
 
 #define THMB_VERSION 1
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct ThumbnailHeader {
 	uint32 type;
@@ -45,9 +43,7 @@
 
 #define ThumbnailHeaderSize (4+4+1+2+2+1)
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 
 inline void colorToRGB(uint16 color, uint8 &r, uint8 &g, uint8 &b) {

Modified: scummvm/trunk/engines/simon/vga.h
===================================================================
--- scummvm/trunk/engines/simon/vga.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/simon/vga.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -26,9 +26,7 @@
 
 namespace Simon {
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 // Feeble Files
 struct VgaFileHeader_Feeble {
@@ -94,9 +92,7 @@
 };
 
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 enum DrawFlags {
 	kDFFlip           = 0x1,

Modified: scummvm/trunk/engines/sky/sound.cpp
===================================================================
--- scummvm/trunk/engines/sky/sound.cpp	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/sky/sound.cpp	2006-07-22 17:28:48 UTC (rev 23569)
@@ -37,9 +37,7 @@
 #define SFXF_START_DELAY 0x80
 #define SFXF_SAVE 0x20
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct RoomList {
 	uint8 room;
@@ -53,9 +51,7 @@
 	RoomList roomList[10];
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 uint16 Sound::_speechConvertTable[8] = {
 	0,									//;Text numbers to file numbers

Modified: scummvm/trunk/engines/sky/struc.h
===================================================================
--- scummvm/trunk/engines/sky/struc.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/sky/struc.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -36,9 +36,7 @@
 	uint32 textWidth;
 };
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct dataFileHeader {
 	uint16 flag; // bit 0: set for colour data, clear for not
@@ -166,9 +164,7 @@
 	MegaSet megaSet3;	 //
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 } // End of namespace Sky
 

Modified: scummvm/trunk/engines/sword1/mouse.h
===================================================================
--- scummvm/trunk/engines/sword1/mouse.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/sword1/mouse.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -48,9 +48,7 @@
 	Object *compact;
 };
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct MousePtr {
 	uint16 numFrames;
@@ -61,9 +59,7 @@
 	uint8  dummyData[0x30];
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 class Logic;
 class Menu;

Modified: scummvm/trunk/engines/sword1/object.h
===================================================================
--- scummvm/trunk/engines/sword1/object.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/sword1/object.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -32,9 +32,7 @@
 #define	O_GRID_SIZE		200
 #define	EXTRA_GRID_SIZE	20
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct OEventSlot {			//receiving event list in the compact -
 	int32	o_event;		//array of these with O_TOTAL_EVENTS elements
@@ -120,9 +118,7 @@
 				// mega size = 12340 bytes (+ 8 byte offset table + 20 byte header = 12368)
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 } // End of namespace Sword1
 

Modified: scummvm/trunk/engines/sword1/router.h
===================================================================
--- scummvm/trunk/engines/sword1/router.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/sword1/router.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -27,9 +27,7 @@
 
 namespace Sword1 {
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct BarData {
 	int16 x1;
@@ -53,9 +51,7 @@
 	int16 dist;
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 struct FloorData {
 	int32		nbars;

Modified: scummvm/trunk/engines/sword1/sworddefs.h
===================================================================
--- scummvm/trunk/engines/sword1/sworddefs.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/engines/sword1/sworddefs.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -89,9 +89,7 @@
 #define	MAX_text_obs	2			//text compacts
 #define	TEXT_sect		149			//text compacts exist in section 149, probably after all the megas
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct Header {
 	char type[6];
@@ -134,9 +132,7 @@
 	int32 numNodes;
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 enum fileTypes {
 	TYPE_CD1 = 0,

Modified: scummvm/trunk/sound/voc.h
===================================================================
--- scummvm/trunk/sound/voc.h	2006-07-22 17:06:14 UTC (rev 23568)
+++ scummvm/trunk/sound/voc.h	2006-07-22 17:28:48 UTC (rev 23569)
@@ -34,9 +34,7 @@
 class AudioStream;
 
 
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h>	// START STRUCT PACKING
 
 struct VocFileHeader {
 	uint8 desc[20];
@@ -52,9 +50,7 @@
 	uint8 pack;
 };
 
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h>	// END STRUCT PACKING
 
 /**
  * Take a sample rate parameter as it occurs in a VOC sound header, and


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list