aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/akos.cpp4
-rw-r--r--engines/scumm/base-costume.h4
-rw-r--r--engines/scumm/boxes.cpp8
-rw-r--r--engines/scumm/file.cpp6
-rw-r--r--engines/scumm/he/intern_he.h8
-rw-r--r--engines/scumm/he/resource_he.h8
-rw-r--r--engines/scumm/intern.h12
-rw-r--r--engines/scumm/object.cpp8
-rw-r--r--engines/scumm/object.h8
-rw-r--r--engines/scumm/player_v2.h8
-rw-r--r--engines/scumm/saveload.cpp8
-rw-r--r--engines/scumm/thumbnail.cpp8
12 files changed, 48 insertions, 42 deletions
diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp
index 26ea99d202..4d01f87e57 100644
--- a/engines/scumm/akos.cpp
+++ b/engines/scumm/akos.cpp
@@ -36,7 +36,7 @@
namespace Scumm {
-#if !defined(__GNUC__)
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
#endif
@@ -54,7 +54,7 @@ struct AkosOffset {
uint16 akci;
} GCC_PACK;
-#if !defined(__GNUC__)
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
#endif
diff --git a/engines/scumm/base-costume.h b/engines/scumm/base-costume.h
index 4fc666e445..516129a564 100644
--- a/engines/scumm/base-costume.h
+++ b/engines/scumm/base-costume.h
@@ -29,7 +29,7 @@
namespace Scumm {
-#if !defined(__GNUC__)
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
#endif
@@ -39,7 +39,7 @@ struct CostumeInfo {
int16 move_x, move_y;
} GCC_PACK;
-#if !defined(__GNUC__)
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
#endif
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index bb5f490f8c..2e2947c475 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -31,8 +31,8 @@
namespace Scumm {
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct Box { /* Internal walkbox file format */
@@ -81,8 +81,8 @@ struct Box { /* Internal walkbox file format */
} GCC_PACK;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
#define BOX_MATRIX_SIZE 2000
diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index 877d1436c4..00393e6274 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -1241,7 +1241,10 @@ static ScummNESFile::LFL lfls[] = {
{ -1, NULL }
};
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
+#endif
+
struct _lfl_index {
byte room_lfl[55];
uint16 room_addr[55];
@@ -1252,7 +1255,10 @@ struct _lfl_index {
byte sound_lfl[100];
uint16 sound_addr[100];
} GCC_PACK lfl_index;
+
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
+#endif
bool ScummNESFile::generateResource(int res) {
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 5fe639db4f..dfdaf4fa18 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -226,8 +226,8 @@ protected:
const char *desc;
};
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct ArrayHeader {
@@ -239,8 +239,8 @@ protected:
byte data[1]; //14
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
const OpcodeEntryV72he *_opcodesV72he;
diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h
index 488a7d5cfc..cc542cfda6 100644
--- a/engines/scumm/he/resource_he.h
+++ b/engines/scumm/he/resource_he.h
@@ -172,8 +172,8 @@ class Win32ResExtractor : public ResExtractor {
* Structures
*/
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct WinLibrary {
@@ -456,8 +456,8 @@ class Win32ResExtractor : public ResExtractor {
uint16 number_of_id_entries;
};
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
/*
diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h
index d14c31acd6..d011370739 100644
--- a/engines/scumm/intern.h
+++ b/engines/scumm/intern.h
@@ -519,9 +519,9 @@ protected:
kDwordArray = 6
};
- #if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
- #endif
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
+#endif
struct ArrayHeader {
int16 dim1;
@@ -530,9 +530,9 @@ protected:
byte data[1];
} GCC_PACK;
- #if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
- #endif
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
+#endif
const OpcodeEntryV6 *_opcodesV6;
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 5f4501ecac..db53ecb3c4 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -36,8 +36,8 @@
namespace Scumm {
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct BompHeader { /* Bomp header */
@@ -53,8 +53,8 @@ struct BompHeader { /* Bomp header */
} GCC_PACK;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
diff --git a/engines/scumm/object.h b/engines/scumm/object.h
index edb779b5eb..2e6a0723e5 100644
--- a/engines/scumm/object.h
+++ b/engines/scumm/object.h
@@ -51,8 +51,8 @@ struct ObjectData {
byte flags;
};
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct RoomHeader {
@@ -159,8 +159,8 @@ struct ImageHeader { /* file format */
} GCC_PACK;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
struct FindObjectInRoom {
diff --git a/engines/scumm/player_v2.h b/engines/scumm/player_v2.h
index 02a74e7bc0..8feb082154 100644
--- a/engines/scumm/player_v2.h
+++ b/engines/scumm/player_v2.h
@@ -37,8 +37,8 @@ namespace Scumm {
class ScummEngine;
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct channel_data {
@@ -66,8 +66,8 @@ struct channel_data {
uint16 music_script_nr; // 48
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 6c8fecd2a9..2a67798f83 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -53,8 +53,8 @@ struct SaveGameHeader {
char name[32];
};
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct SaveInfoSection {
@@ -69,8 +69,8 @@ struct SaveInfoSection {
uint16 time;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
#define INFOSECTION_VERSION 2
diff --git a/engines/scumm/thumbnail.cpp b/engines/scumm/thumbnail.cpp
index af2052fa87..0008d7539c 100644
--- a/engines/scumm/thumbnail.cpp
+++ b/engines/scumm/thumbnail.cpp
@@ -31,8 +31,8 @@ namespace Scumm {
#define THMB_VERSION 1
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct ThumbnailHeader {
@@ -43,8 +43,8 @@ struct ThumbnailHeader {
byte bpp;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-15 12:32:20 +0000