[Scummvm-cvs-logs] SF.net SVN: scummvm:[47695] scummvm/trunk/engines/sci/graphics/gui32.cpp

[thebluegr at users.sourceforge.net]

Revision: 47695
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47695&view=rev
Author:   thebluegr
Date:     2010-01-30 01:46:54 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Added a sanity check to baseSetter() - Torin's demo progresses a bit further now

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/gui32.cpp

Modified: scummvm/trunk/engines/sci/graphics/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui32.cpp	2010-01-30 01:45:59 UTC (rev 47694)
+++ scummvm/trunk/engines/sci/graphics/gui32.cpp	2010-01-30 01:46:54 UTC (rev 47695)
@@ -145,17 +145,19 @@
 		int16 loopNo = GET_SEL32V(_s->_segMan, object, loop);
 		int16 celNo = GET_SEL32V(_s->_segMan, object, cel);
 
-		View *tmpView = _gfx->getView(viewId);
-		Common::Rect celRect;
+		if (viewId != SIGNAL_OFFSET) {
+			View *tmpView = _gfx->getView(viewId);
+			Common::Rect celRect;
 
-		tmpView->getCelRect(loopNo, celNo, x, y, z, &celRect);
-		celRect.bottom = y + 1;
-		celRect.top = celRect.bottom - yStep;
+			tmpView->getCelRect(loopNo, celNo, x, y, z, &celRect);
+			celRect.bottom = y + 1;
+			celRect.top = celRect.bottom - yStep;
 
-		PUT_SEL32V(_s->_segMan, object, brLeft, celRect.left);
-		PUT_SEL32V(_s->_segMan, object, brRight, celRect.right);
-		PUT_SEL32V(_s->_segMan, object, brTop, celRect.top);
-		PUT_SEL32V(_s->_segMan, object, brBottom, celRect.bottom);
+			PUT_SEL32V(_s->_segMan, object, brLeft, celRect.left);
+			PUT_SEL32V(_s->_segMan, object, brRight, celRect.right);
+			PUT_SEL32V(_s->_segMan, object, brTop, celRect.top);
+			PUT_SEL32V(_s->_segMan, object, brBottom, celRect.bottom);
+		}
 	}
 }
 


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