[Scummvm-cvs-logs] CVS: scummvm/sword2 save_rest.cpp,1.43,1.44

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv27536

Modified Files:
	save_rest.cpp 
Log Message:
Fixed bug that made ScummVM crash when loading a savegame where the main
character was walking. (I had missed a case where pointers were cast to
integers.)


Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/save_rest.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- save_rest.cpp	28 Dec 2003 15:08:11 -0000	1.43
+++ save_rest.cpp	3 Jan 2004 15:52:05 -0000	1.44
@@ -350,7 +350,7 @@
 	varsRes = _resman->openResource(1);
 
 	// copy that to the buffer, following the header
-	memcpy(varsRes, buffer->ad + sizeof(_saveGameHeader), _saveGameHeader.varLength );
+	memcpy(varsRes, buffer->ad + sizeof(_saveGameHeader), _saveGameHeader.varLength);
 
 #ifdef SCUMM_BIG_ENDIAN
 	uint32 *globalVars = (uint32 *) (varsRes + sizeof(StandardHeader));
@@ -583,10 +583,10 @@
 		ob_mega->currently_walking = 0;
 
 		// pointer to object's graphic structure
-		pars[0] = (int32) ob_graphic;
+		pars[0] = _vm->_memory->ptrToInt((const uint8 *) ob_graphic);
 
 		// pointer to object's mega structure
-		pars[1] = (int32) ob_mega;
+		pars[1] = _vm->_memory->ptrToInt((const uint8 *) ob_mega);
 
 		// target direction
 		pars[2] = ob_mega->current_dir;