aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-09-13 19:26:44 +0000
committerMax Horn2003-09-13 19:26:44 +0000
commit7eb758f69722a5c201c99c9f9c384494dd2e4cf0 (patch)
treed54214c6ba285cb34bdefeb483a6f1c405a773ac
parentbd11fd12176a1ea76fbb2ceff8415658ea75b889 (diff)
downloadscummvm-rg350-7eb758f69722a5c201c99c9f9c384494dd2e4cf0.tar.gz
scummvm-rg350-7eb758f69722a5c201c99c9f9c384494dd2e4cf0.tar.bz2
scummvm-rg350-7eb758f69722a5c201c99c9f9c384494dd2e4cf0.zip
I am not happy at all with the slack our team has shown recently! I barely concealed these obvious mistakes, to check who's paying attention. And only one person (olki) did notice, and even he only got 50%... tsk tsk tsk, how shall this go on. What will happen if I make real mistakes instead of purposeful ones? *cough cough* yeah, right
svn-id: r10240
-rw-r--r--sword2/save_rest.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/sword2/save_rest.cpp b/sword2/save_rest.cpp
index 01adb0f499..38521fea3f 100644
--- a/sword2/save_rest.cpp
+++ b/sword2/save_rest.cpp
@@ -89,9 +89,9 @@ static _savegameHeader g_header; // global because easier to copy to/from playe
#ifdef SCUMM_BIG_ENDIAN
// Quick macro to make swapping in-place easier to write
-#define SWAP32_S(x) x = (int16)SWAP_BYTES_32(x)
+#define SWAP32_S(x) x = (int32)SWAP_BYTES_32(x)
#define SWAP32_U(x) x = SWAP_BYTES_32(x)
-static void converHeaderEndian(_savegameHeader &header) {
+static void convertHeaderEndian(_savegameHeader &header) {
int i;
// _savegameHeader
@@ -205,7 +205,7 @@ void FillSaveBuffer(mem *buffer, uint32 size, uint8 *desc)
// copy the header to the buffer
#ifdef SCUMM_BIG_ENDIAN
- converHeaderEndian(g_header);
+ convertHeaderEndian(g_header);
#endif
memcpy(buffer->ad, &g_header, sizeof(g_header)); // copy the header to the savegame buffer
@@ -221,6 +221,7 @@ void FillSaveBuffer(mem *buffer, uint32 size, uint8 *desc)
globalVars[i] = SWAP_BYTES_32(globalVars[i]);
}
#endif
+
res_man.Res_close(1); // close variables resource
//------------------------------------------------------
@@ -348,7 +349,7 @@ uint32 RestoreFromBuffer(mem *buffer, uint32 size)
memcpy( &g_header, buffer->ad, sizeof(g_header) ); // get a copy of the header from the savegame buffer
#ifdef SCUMM_BIG_ENDIAN
- converHeaderEndian(g_header);
+ convertHeaderEndian(g_header);
#endif
//------------------------------------------------------