aboutsummaryrefslogtreecommitdiff
path: root/sword2/sword2.h
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-04-26 07:37:25 +0000
committerTorbjörn Andersson2004-04-26 07:37:25 +0000
commit0fcd887dcd38109688c8f7e07bf366430507fa3b (patch)
tree1541e6d72b0493d44f6ceca89b1876e5ccc23d0a /sword2/sword2.h
parentd2aa9b91b5d9ec5a231f44c56558b0e70c244861 (diff)
downloadscummvm-rg350-0fcd887dcd38109688c8f7e07bf366430507fa3b.tar.gz
scummvm-rg350-0fcd887dcd38109688c8f7e07bf366430507fa3b.tar.bz2
scummvm-rg350-0fcd887dcd38109688c8f7e07bf366430507fa3b.zip
Cleanup. Mostly removal of redundant comments.
I've also made the SaveGameHeader struct packed, which may break savegame compatibility on some architectures (though not on the Linux and Windows boxes I've tried it on). But I'm hoping it will guarantee, or at least make it more likely, that savegames will be portable across architectures. svn-id: r13634
Diffstat (limited to 'sword2/sword2.h')
-rw-r--r--sword2/sword2.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/sword2/sword2.h b/sword2/sword2.h
index b256557f01..d75ad15ffe 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -279,6 +279,10 @@ public:
// savegame file header
+#if !defined(__GNUC__)
+ #pragma START_PACK_STRUCTS
+#endif
+
struct SaveGameHeader {
// sum of all bytes in file, excluding this uint32
uint32 checksum;
@@ -294,13 +298,13 @@ public:
uint32 music_id; // copy of 'looping_music_id'
ObjectHub player_hub; // copy of player object's object_hub structure
ObjectLogic logic; // copy of player character logic structure
+ ObjectGraphic graphic; // copy of player character graphic structure
+ ObjectMega mega; // copy of player character mega structure
+ } GCC_PACK;
- // copy of player character graphic structure
- ObjectGraphic graphic;
-
- // copy of player character mega structure
- ObjectMega mega;
- };
+#if !defined(__GNUC__)
+ #pragma END_PACK_STRUCTS
+#endif
SaveGameHeader _saveGameHeader;