aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorColin Snover2017-11-07 22:26:21 -0600
committerColin Snover2018-01-12 00:44:48 -0600
commit10f1eab3c9f07390eb0e437948e4dfb3a927c93e (patch)
treee7b0ac34ca2d6b59ad05efb7bda0f62d199df078 /engines
parent93935a779883131f7f9568153cf29ead2affd833 (diff)
downloadscummvm-rg350-10f1eab3c9f07390eb0e437948e4dfb3a927c93e.tar.gz
scummvm-rg350-10f1eab3c9f07390eb0e437948e4dfb3a927c93e.tar.bz2
scummvm-rg350-10f1eab3c9f07390eb0e437948e4dfb3a927c93e.zip
CRYO: Stop packing struct containing pointers
This struct packing causes the pointer-to-member-function to become unaligned, and does not seem necessary in any way. Closes gh-1081.
Diffstat (limited to 'engines')
-rw-r--r--engines/cryo/eden.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
index 78dd622302..103d9fde9e 100644
--- a/engines/cryo/eden.cpp
+++ b/engines/cryo/eden.cpp
@@ -3126,13 +3126,11 @@ void EdenGame::tyranDies(perso_t *perso) {
}
void EdenGame::specialObjects(perso_t *perso, char objid) {
-#pragma pack(push, 1)
struct SpecialObject {
int8 _characterType;
int8 _objectId;
void (EdenGame::*dispFct)(perso_t *perso);
};
-#pragma pack(pop)
static SpecialObject kSpecialObjectActions[] = {
// persoType, objectId, dispFct