Ticket #4380: sky_grid.patch

engines/sky/grid.cpp

@@ -255 +255 @@
 }
 
 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

engines/sky/sky.cpp

@@ -208 +208 @@
                 _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();