From 1847b0f7059328e195d9fca2372ab2b8a12aad06 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Wed, 21 Sep 2016 16:16:21 -0500
Subject: SCI32: Fix warnings and incompatible save games when built without
 SCI32

---
 engines/sci/engine/savegame.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'engines/sci/engine/savegame.h')

diff --git a/engines/sci/engine/savegame.h b/engines/sci/engine/savegame.h
index 627fc64118..8c54f3b7ce 100644
--- a/engines/sci/engine/savegame.h
+++ b/engines/sci/engine/savegame.h
@@ -37,7 +37,7 @@ struct EngineState;
  *
  * Version - new/changed feature
  * =============================
- *      38 - SCI32 cursor, accurate SCI32 arrays/strings, score metadata
+ *      38 - SCI32 cursor, accurate SCI32 arrays/strings, score metadata, avatar metadata
  *      37 - Segment entry data changed to pointers
  *      36 - SCI32 bitmap segment
  *      35 - SCI32 remap
@@ -77,14 +77,13 @@ struct SavegameMetadata {
 	uint32 playTime;
 	uint16 gameObjectOffset;
 	uint16 script0Size;
-#ifdef ENABLE_SCI32
-	union {
-		// Used by Shivers 1
-		uint32 score;
-		// Used by MGDX
-		uint8 avatarId;
-	};
-#endif
+
+	// Used by Shivers 1
+	uint16 lowScore;
+	uint16 highScore;
+
+	// Used by MGDX
+	uint8 avatarId;
 };
 
 /**
-- 
cgit v1.2.3