diff options
| author | Colin Snover | 2016-09-21 16:16:21 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-09-29 19:39:16 -0500 |
| commit | 1847b0f7059328e195d9fca2372ab2b8a12aad06 (patch) | |
| tree | e7e20257231c81b6728445ae2084fcc7065c457f /engines/sci/engine/savegame.h | |
| parent | 3e75f42d85d82cc77d2607def29f4b63208844c1 (diff) | |
| download | scummvm-rg350-1847b0f7059328e195d9fca2372ab2b8a12aad06.tar.gz scummvm-rg350-1847b0f7059328e195d9fca2372ab2b8a12aad06.tar.bz2 scummvm-rg350-1847b0f7059328e195d9fca2372ab2b8a12aad06.zip | |
SCI32: Fix warnings and incompatible save games when built without SCI32
Diffstat (limited to 'engines/sci/engine/savegame.h')
| -rw-r--r-- | engines/sci/engine/savegame.h | 17 |
1 files changed, 8 insertions, 9 deletions
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; }; /** |