[Scummvm-cvs-logs] SF.net SVN: scummvm:[39897] scummvm/branches/branch-0-13-0/engines/saga

[wjpalenstijn at users.sourceforge.net]

Revision: 39897
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39897&view=rev
Author:   wjpalenstijn
Date:     2009-04-07 20:05:25 +0000 (Tue, 07 Apr 2009)

Log Message:
-----------
Backport of r39655. Fixes hang in ITE near the end.

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/saga/render.cpp
    scummvm/branches/branch-0-13-0/engines/saga/sprite.cpp

Modified: scummvm/branches/branch-0-13-0/engines/saga/render.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/saga/render.cpp	2009-04-07 19:52:46 UTC (rev 39896)
+++ scummvm/branches/branch-0-13-0/engines/saga/render.cpp	2009-04-07 20:05:25 UTC (rev 39897)
@@ -49,7 +49,7 @@
 	_vm = vm;
 	_system = system;
 	_initialized = false;
-	_fullRefresh = false;
+	_fullRefresh = true;
 
 #ifdef SAGA_DEBUG
 	// Initialize FPS timer callback
@@ -83,10 +83,6 @@
 	int curMode = _vm->_interface->getMode();
 	assert(_initialized);
 
-	// TODO: Remove this to use dirty rectangles
-	// Still quite buggy
-	_fullRefresh = true;
-
 #ifdef SAGA_DEBUG
 	_renderedFrameCount++;
 #endif
@@ -206,7 +202,9 @@
 
 	_system->updateScreen();
 
-	_fullRefresh = false;
+	// TODO: Change this to false to use dirty rectangles
+	// Still quite buggy
+	_fullRefresh = true;
 }
 
 void Render::addDirtyRect(Common::Rect rect) {

Modified: scummvm/branches/branch-0-13-0/engines/saga/sprite.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/saga/sprite.cpp	2009-04-07 19:52:46 UTC (rev 39896)
+++ scummvm/branches/branch-0-13-0/engines/saga/sprite.cpp	2009-04-07 20:05:25 UTC (rev 39897)
@@ -89,8 +89,8 @@
 
 void Sprite::loadList(int resourceId, SpriteList &spriteList) {
 	SpriteInfo *spriteInfo;
-	byte *spriteListData;
-	size_t spriteListLength;
+	byte *spriteListData = 0;
+	size_t spriteListLength = 0;
 	uint16 oldSpriteCount;
 	uint16 newSpriteCount;
 	uint16 spriteCount;


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