aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/scenery.h
diff options
context:
space:
mode:
authorMax Horn2006-07-22 17:28:48 +0000
committerMax Horn2006-07-22 17:28:48 +0000
commit2859b647026af1a927d1a74100f125bbc0f77db3 (patch)
treee842c9e2e67296f5bbc48645ba49b469edb7bd22 /engines/gob/scenery.h
parent1ffd49604357ed6fd63e133369a89e3b57711ae2 (diff)
downloadscummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.tar.gz
scummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.tar.bz2
scummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.zip
Fix struct packing issues (macros are not resolve in #pragma params, at least for GCC)
svn-id: r23569
Diffstat (limited to 'engines/gob/scenery.h')
-rw-r--r--engines/gob/scenery.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/gob/scenery.h b/engines/gob/scenery.h
index 925130e687..aad6a57dbf 100644
--- a/engines/gob/scenery.h
+++ b/engines/gob/scenery.h
@@ -28,9 +28,7 @@ namespace Gob {
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 @@ public:
AnimFramePiece *frames;
};
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h> // END STRUCT PACKING
struct Static {
int16 layersCount;