From 4f7913c3553a0294675b46a9ccbbee19fceecb8d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 Nov 2013 21:50:52 -0500
Subject: TSAGE: R2R Fix for restoriong scenes with objects using a shadow map

---
 engines/tsage/core.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index f2744d5bf8..040dbc8c25 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2737,15 +2737,16 @@ void SceneObject::reposition() {
  */
 void SceneObject::draw() {
 	Rect destRect = _bounds;
-	destRect.translate(-g_globals->_sceneManager._scene->_sceneBounds.left,
-		-g_globals->_sceneManager._scene->_sceneBounds.top);
+	Scene *scene = g_globals->_sceneManager._scene;
+	destRect.translate(-scene->_sceneBounds.left, -scene->_sceneBounds.top);
 	GfxSurface frame = getFrame();
-	Region *priorityRegion = g_globals->_sceneManager._scene->_priorities.find(_priority);
+	Region *priorityRegion = scene->_priorities.find(_priority);
 
 	if (g_vm->getGameID() == GType_Ringworld2) {
 		switch (_effect) {
 		case EFFECT_SHADOW_MAP: {
-			assert(_shadowMap);
+			if (!_shadowMap)
+				_shadowMap = static_cast<Ringworld2::SceneExt *>(scene)->_shadowPaletteMap;
 
 			GLOBALS.gfxManager().getSurface().copyFrom(frame, frame.getBounds(),
 				destRect, priorityRegion,  _shadowMap);
-- 
cgit v1.2.3