From 3ad054d85cb9ff84911eb8c8c84397a2f9b0c30f Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko <sev@scummvm.org>
Date: Wed, 23 Jun 2021 18:38:24 +0200
Subject: [PATCH] SAGA2: Properly mark structs as packed

---
 engines/saga2/idtypes.h | 4 +++-
 engines/saga2/mission.h | 2 +-
 engines/saga2/tcoords.h | 2 +-
 engines/saga2/tile.h    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/engines/saga2/idtypes.h b/engines/saga2/idtypes.h
index 28b68083f6a..8832652985c 100644
--- a/engines/saga2/idtypes.h
+++ b/engines/saga2/idtypes.h
@@ -108,6 +108,7 @@ const int   activeItemMapShift = 13;
 
 const int16 activeItemIndexNullID = 0x1FFF;
 
+#include "common/pack-start.h"
 struct ActiveItemID {
 	int16           val;            //  ID value --
 	//      first 3 bits world number
@@ -179,7 +180,8 @@ struct ActiveItemID {
 	int16 getIndexNum(void) {
 		return val & activeItemIndexMask;
 	}
-};
+} PACKED_STRUCT;
+#include "common/pack-end.h"
 
 //  ID of NULL active item
 extern const ActiveItemID   NoActiveItem;
diff --git a/engines/saga2/mission.h b/engines/saga2/mission.h
index a9f2a47bb61..67bbb55e8c2 100644
--- a/engines/saga2/mission.h
+++ b/engines/saga2/mission.h
@@ -63,7 +63,7 @@ struct ActiveMissionData {
 	KnowledgeID     missionKnowledgeList[32];
 	uint16          numObjectIDs,
 	                numKnowledgeIDs;
-};
+} PACKED_STRUCT;
 
 #include "common/pack-end.h"
 
diff --git a/engines/saga2/tcoords.h b/engines/saga2/tcoords.h
index 8add87b1e48..4264e1a60de 100644
--- a/engines/saga2/tcoords.h
+++ b/engines/saga2/tcoords.h
@@ -104,7 +104,7 @@ struct TilePoint {
 	int16 quickDir(void);
 
 	int16 magnitude(void);
-};
+} PACKED_STRUCT;
 #include "common/pack-end.h"
 
 
diff --git a/engines/saga2/tile.h b/engines/saga2/tile.h
index 9ad6ad51010..1df569bd21b 100644
--- a/engines/saga2/tile.h
+++ b/engines/saga2/tile.h
@@ -383,7 +383,7 @@ struct ActiveItemData {
 			        worldNum;               // Add 0xf000 to get world Object ID
 		} instance;
 	};
-};
+} PACKED_STRUCT;
 
 #include "common/pack-end.h"