[Scummvm-cvs-logs] SF.net SVN: scummvm:[42470] scummvm/trunk/engines/sky

[joostp at users.sourceforge.net]

Revision: 42470
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42470&view=rev
Author:   joostp
Date:     2009-07-14 09:44:56 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
commit peres' patch for #2813472: BASS: "showgrid" enabled triggers an assert 

Modified Paths:
--------------
    scummvm/trunk/engines/sky/grid.cpp
    scummvm/trunk/engines/sky/sky.cpp

Modified: scummvm/trunk/engines/sky/grid.cpp
===================================================================
--- scummvm/trunk/engines/sky/grid.cpp	2009-07-14 08:57:55 UTC (rev 42469)
+++ scummvm/trunk/engines/sky/grid.cpp	2009-07-14 09:44:56 UTC (rev 42470)
@@ -255,8 +255,10 @@
 }
 
 uint8 *Grid::giveGrid(uint32 pScreen) {
-	assert((_gridConvertTable[pScreen] >= 0) && (_gridConvertTable[pScreen] < TOT_NO_GRIDS));
-	return _gameGrids[_gridConvertTable[pScreen]];
+	if ((_gridConvertTable[pScreen] >= 0) && (_gridConvertTable[pScreen] < TOT_NO_GRIDS)) {
+		return _gameGrids[_gridConvertTable[pScreen]];
+	}
+	return 0;
 }
 
 } // End of namespace Sky

Modified: scummvm/trunk/engines/sky/sky.cpp
===================================================================
--- scummvm/trunk/engines/sky/sky.cpp	2009-07-14 08:57:55 UTC (rev 42469)
+++ scummvm/trunk/engines/sky/sky.cpp	2009-07-14 09:44:56 UTC (rev 42470)
@@ -208,8 +208,11 @@
 		_skyScreen->recreate();
 		_skyScreen->spriteEngine();
 		if (_debugger->showGrid()) {
-			_skyScreen->showGrid(_skyLogic->_skyGrid->giveGrid(Logic::_scriptVariables[SCREEN]));
-			_skyScreen->forceRefresh();
+			uint8 *grid = _skyLogic->_skyGrid->giveGrid(Logic::_scriptVariables[SCREEN]);
+			if (grid) {
+				_skyScreen->showGrid(grid);
+				_skyScreen->forceRefresh();
+			}
 		}
 		_skyScreen->flip();
 


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