[Scummvm-cvs-logs] CVS: scummvm/bs2 save_rest.cpp,1.11,1.12

Max Horn fingolfin at users.sourceforge.net
Sat Sep 13 12:27:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv30650

Modified Files:
	save_rest.cpp 
Log Message:
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

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/save_rest.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- save_rest.cpp	13 Sep 2003 18:18:02 -0000	1.11
+++ save_rest.cpp	13 Sep 2003 19:26:44 -0000	1.12
@@ -89,9 +89,9 @@
 
 #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 @@
 	// 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 @@
 		globalVars[i] = SWAP_BYTES_32(globalVars[i]);
 	}
 #endif
+
  	res_man.Res_close(1);											// close variables resource
 
 	//------------------------------------------------------
@@ -348,7 +349,7 @@
 
 	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
 
   	//------------------------------------------------------





More information about the Scummvm-git-logs mailing list