aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2006-07-23 02:20:49 +0000
committerJohannes Schickel2006-07-23 02:20:49 +0000
commita68f7100cef07e096a592307e1eebd17e061de11 (patch)
tree014051cb2fcc2320d0d260f65db3b8be811b8214
parent9ab0c1d9152f29d439b5ef84f6bf93a783dd711f (diff)
downloadscummvm-rg350-a68f7100cef07e096a592307e1eebd17e061de11.tar.gz
scummvm-rg350-a68f7100cef07e096a592307e1eebd17e061de11.tar.bz2
scummvm-rg350-a68f7100cef07e096a592307e1eebd17e061de11.zip
No need for packing SaveInfoSection and ThumbnailHeader anymore.
svn-id: r23572
-rw-r--r--engines/scumm/saveload.cpp4
-rw-r--r--engines/scumm/thumbnail.cpp5
2 files changed, 0 insertions, 9 deletions
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 29d050d12c..4ef201a2b5 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -53,8 +53,6 @@ struct SaveGameHeader {
char name[32];
};
-#include <common/pack-start.h> // START STRUCT PACKING
-
struct SaveInfoSection {
uint32 type;
uint32 version;
@@ -69,8 +67,6 @@ struct SaveInfoSection {
#define SaveInfoSectionSize (4+4+4 + 4+4 + 4+2)
-#include <common/pack-end.h> // END STRUCT PACKING
-
#define INFOSECTION_VERSION 2
void ScummEngine::requestSave(int slot, const char *name, bool temporary) {
diff --git a/engines/scumm/thumbnail.cpp b/engines/scumm/thumbnail.cpp
index a76088949e..023848c02a 100644
--- a/engines/scumm/thumbnail.cpp
+++ b/engines/scumm/thumbnail.cpp
@@ -31,8 +31,6 @@ namespace Scumm {
#define THMB_VERSION 1
-#include <common/pack-start.h> // START STRUCT PACKING
-
struct ThumbnailHeader {
uint32 type;
uint32 size;
@@ -43,9 +41,6 @@ struct ThumbnailHeader {
#define ThumbnailHeaderSize (4+4+1+2+2+1)
-#include <common/pack-end.h> // END STRUCT PACKING
-
-
inline void colorToRGB(uint16 color, uint8 &r, uint8 &g, uint8 &b) {
r = (((color >> 11) & 0x1F) << 3);
g = (((color >> 5) & 0x3F) << 2);