o Fix for popped up actors at initial scene fade out

o Stub for new Wyrmkeep demos with substituted scenes
o Converted some script func parameters to apropriate types
o More panel fixes

svn-id: r16472

1 files changed, 14 insertions, 12 deletions

diff --git a/saga/render.cpp b/saga/render.cpp
index 7d75de1efa..67409add72 100644
--- a/saga/render.cpp
+++ b/saga/render.cpp
@@ -126,18 +126,20 @@ int Render::drawScene() {
 		// Display scene background
 		_vm->_scene->draw(backbuf_surface);
 
-		// Display scene maps, if applicable
-		if (getFlags() & RF_OBJECTMAP_TEST) {
-			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(RGB_RED));
-		}
-
-		// Draw queued actors
-		_vm->_actor->drawActors();
-		if (getFlags() & RF_ACTOR_PATH_TEST) {
-			_vm->_actor->drawPathTest();
+		if (_vm->_interface->getMode() != kPanelFade) {
+			// Display scene maps, if applicable
+			if (getFlags() & RF_OBJECTMAP_TEST) {
+				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(RGB_RED));
+			}
+
+			// Draw queued actors
+			_vm->_actor->drawActors();
+			if (getFlags() & RF_ACTOR_PATH_TEST) {
+				_vm->_actor->drawPathTest();
+			}
 		}
 	}