[Scummvm-cvs-logs] SF.net SVN: scummvm: [28370] scummvm/trunk/engines/touche/saveload.cpp

[cyx at users.sourceforge.net]

Revision: 28370
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28370&view=rev
Author:   cyx
Date:     2007-07-31 14:17:15 -0700 (Tue, 31 Jul 2007)

Log Message:
-----------
fix for bug #1751226 (glitches on save/load

Modified Paths:
--------------
    scummvm/trunk/engines/touche/saveload.cpp

Modified: scummvm/trunk/engines/touche/saveload.cpp
===================================================================
--- scummvm/trunk/engines/touche/saveload.cpp	2007-07-31 20:15:58 UTC (rev 28369)
+++ scummvm/trunk/engines/touche/saveload.cpp	2007-07-31 21:17:15 UTC (rev 28370)
@@ -280,8 +280,8 @@
 	_newMusicNum = stream->readUint16LE();
 	_currentRoomNum = stream->readUint16LE();
 	res_loadRoom(_currentRoomNum);
-	int16 roomOffsX = stream->readUint16LE();
-	int16 roomOffsY = stream->readUint16LE();
+	int16 roomOffsX = _flagsTable[614] = stream->readUint16LE();
+	int16 roomOffsY = _flagsTable[615] = stream->readUint16LE();
 	_disabledInputCounter = stream->readUint16LE();
 	res_loadProgram(_currentEpisodeNum);
 	setupEpisode(-1);
@@ -291,7 +291,7 @@
 	saveOrLoadCommonArray(*stream, _programWalkTable);
 	saveOrLoadCommonArray(*stream, _programPointsTable);
 	stream->read(_updatedRoomAreasTable, 200);
-	for (uint i = 1; i <= _updatedRoomAreasTable[0]; ++i) {
+	for (uint i = 1; i < _updatedRoomAreasTable[0]; ++i) {
 		updateRoomAreas(_updatedRoomAreasTable[i], -1);
 	}
 	saveOrLoadStaticArray(*stream, _sequenceEntryTable, NUM_SEQUENCES);
@@ -327,7 +327,9 @@
 	Graphics::copyRect(_offscreenBuffer, kScreenWidth, 0, 0,
 	  _backdropBuffer, _currentBitmapWidth, _flagsTable[614], _flagsTable[615],
 	  kScreenWidth, kRoomHeight);
+	updateRoomRegions();
 	updateEntireScreen();
+	_roomNeedRedraw = false;
 	if (_flagsTable[617] != 0) {
 		res_loadSpeech(_flagsTable[617]);
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.