aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/akos.cpp8
-rw-r--r--engines/scumm/base-costume.h8
-rw-r--r--engines/scumm/boxes.cpp8
-rw-r--r--engines/scumm/file.cpp8
-rw-r--r--engines/scumm/he/intern_he.h8
-rw-r--r--engines/scumm/he/resource_he.h8
-rw-r--r--engines/scumm/intern.h8
-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, 24 insertions, 72 deletions
diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp
index f0bbc0bcc8..139c18be37 100644
--- a/engines/scumm/akos.cpp
+++ b/engines/scumm/akos.cpp
@@ -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 @@ struct AkosOffset {
uint16 akci;
};
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h> // END STRUCT PACKING
enum AkosOpcodes {
diff --git a/engines/scumm/base-costume.h b/engines/scumm/base-costume.h
index 56b4f717db..b4e875a4a8 100644
--- a/engines/scumm/base-costume.h
+++ b/engines/scumm/base-costume.h
@@ -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 @@ struct CostumeInfo {
int16 move_x, move_y;
};
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h> // END STRUCT PACKING
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index 5a42a99212..a066b448de 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -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 @@ struct Box { /* Internal walkbox file format */
};
};
-#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
diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index a043710dea..b08ec0e41f 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -1241,9 +1241,7 @@ static ScummNESFile::LFL lfls[] = {
{ -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 @@ struct _lfl_index {
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) {
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 514e98afc9..250dbaad5a 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -226,9 +226,7 @@ protected:
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 @@ protected:
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;
diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h
index 5176f6bb41..468812a236 100644
--- a/engines/scumm/he/resource_he.h
+++ b/engines/scumm/he/resource_he.h
@@ -172,9 +172,7 @@ class Win32ResExtractor : public ResExtractor {
* 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 @@ class Win32ResExtractor : public ResExtractor {
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
diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h
index 36bc1c7306..2ccce37b36 100644
--- a/engines/scumm/intern.h
+++ b/engines/scumm/intern.h
@@ -519,9 +519,7 @@ protected:
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 @@ protected:
byte data[1];
};
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h> // END STRUCT PACKING
const OpcodeEntryV6 *_opcodesV6;
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 6b07ed5dba..6ba1d60a60 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -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 @@ struct BompHeader { /* Bomp header */
};
};
-#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 {
diff --git a/engines/scumm/object.h b/engines/scumm/object.h
index c622ed026a..016aea1803 100644
--- a/engines/scumm/object.h
+++ b/engines/scumm/object.h
@@ -51,9 +51,7 @@ struct ObjectData {
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 @@ struct ImageHeader { /* file format */
};
};
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h> // END STRUCT PACKING
struct FindObjectInRoom {
const CodeHeader *cdhd;
diff --git a/engines/scumm/player_v2.h b/engines/scumm/player_v2.h
index 88562311fc..066da8acde 100644
--- a/engines/scumm/player_v2.h
+++ b/engines/scumm/player_v2.h
@@ -37,9 +37,7 @@ namespace Scumm {
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 @@ struct channel_data {
uint16 music_script_nr; // 48
};
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h> // END STRUCT PACKING
/**
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 7b5cb2c145..29d050d12c 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -53,9 +53,7 @@ struct SaveGameHeader {
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 @@ struct SaveInfoSection {
#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
diff --git a/engines/scumm/thumbnail.cpp b/engines/scumm/thumbnail.cpp
index 1458cec359..a76088949e 100644
--- a/engines/scumm/thumbnail.cpp
+++ b/engines/scumm/thumbnail.cpp
@@ -31,9 +31,7 @@ namespace Scumm {
#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 @@ struct ThumbnailHeader {
#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) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-15 17:51:10 +0000