diff options
author | Torbjörn Andersson | 2004-10-09 07:39:46 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2004-10-09 07:39:46 +0000 |
commit | 64a91605a11152e2b1c54eba0e5ae9d514530028 (patch) | |
tree | d090c55c229e7aded7829780b0403891a5808109 /saga/render.cpp | |
parent | c68b6323e502af2bc8af682dac17603091cd5240 (diff) | |
download | scummvm-rg350-64a91605a11152e2b1c54eba0e5ae9d514530028.tar.gz scummvm-rg350-64a91605a11152e2b1c54eba0e5ae9d514530028.tar.bz2 scummvm-rg350-64a91605a11152e2b1c54eba0e5ae9d514530028.zip |
Initial attempt at fixing the SData problem. I'm still not sure exactly how
to fix the script "static" area, though.
In addition, initialise a few variables, and test for NULL-ness of a few
pointers. This fixes a few crashes I saw with yesterday's CVS snapshot.
There's still an unexpected scene change in the intro (I think it triggers
on Rhene walking too close to the exit), but at least it no longer crashes.
svn-id: r15484
Diffstat (limited to 'saga/render.cpp')
-rw-r--r-- | saga/render.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/saga/render.cpp b/saga/render.cpp index 10c26a661c..f401611412 100644 --- a/saga/render.cpp +++ b/saga/render.cpp @@ -134,8 +134,10 @@ int Render::drawScene() { // Display scene maps, if applicable if (getFlags() & RF_OBJECTMAP_TEST) { - _vm->_scene->_objectMap->draw(backbuf_surface, mouse_pt, _vm->_gfx->getWhite(), _vm->_gfx->getBlack()); - _vm->_scene->_actionMap->draw(backbuf_surface, _vm->_gfx->matchColor(R_RGB_RED)); + if (_vm->_scene->_objectMap) + _vm->_scene->_objectMap->draw(backbuf_surface, mouse_pt, _vm->_gfx->getWhite(), _vm->_gfx->getBlack()); + if (_vm->_scene->_actionMap) + _vm->_scene->_actionMap->draw(backbuf_surface, _vm->_gfx->matchColor(R_RGB_RED)); } // Draw queued actors |