[Scummvm-cvs-logs] SF.net SVN: scummvm: [32090] scummvm/trunk/engines/gob/video.cpp

[drmccoy at users.sourceforge.net]

Revision: 32090
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32090&view=rev
Author:   drmccoy
Date:     2008-05-13 11:43:26 -0700 (Tue, 13 May 2008)

Log Message:
-----------
Fixing the crash when entering the virtual trip tower in Woodruff

Modified Paths:
--------------
    scummvm/trunk/engines/gob/video.cpp

Modified: scummvm/trunk/engines/gob/video.cpp
===================================================================
--- scummvm/trunk/engines/gob/video.cpp	2008-05-13 16:12:37 UTC (rev 32089)
+++ scummvm/trunk/engines/gob/video.cpp	2008-05-13 18:43:26 UTC (rev 32090)
@@ -178,8 +178,8 @@
 		int screenOffset = _scrollOffsetY * _surfWidth + _scrollOffsetX;
 		int screenX = _screenDeltaX;
 		int screenY = _screenDeltaY;
-		int screenWidth = _vm->_width;
-		int screenHeight = _splitHeight1;
+		int screenWidth = MIN<int>(_surfWidth, _vm->_width);
+		int screenHeight = MIN<int>(_splitHeight1, _vm->_height - _splitHeight2 - _screenDeltaY);
 
 		g_system->copyRectToScreen(_vm->_global->_primarySurfDesc->getVidMem() + screenOffset,
 				_surfWidth, screenX, screenY, screenWidth, screenHeight);
@@ -188,7 +188,7 @@
 			screenOffset = _splitStart * _surfWidth;
 			screenX = 0;
 			screenY = _vm->_height - _splitHeight2;
-			screenWidth = _vm->_width;
+			screenWidth = MIN<int>(_surfWidth, _vm->_width);
 			screenHeight = _splitHeight2;
 
 			g_system->copyRectToScreen(_vm->_global->_primarySurfDesc->getVidMem() + screenOffset,


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