[Scummvm-cvs-logs] scummvm master -> f1797a3820d5b2e6397892e580f856683d2d5f7f

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f1797a3820 TSAGE: Fix for R2R canyon overhang reappearing after collapsed


Commit: f1797a3820d5b2e6397892e580f856683d2d5f7f
    https://github.com/scummvm/scummvm/commit/f1797a3820d5b2e6397892e580f856683d2d5f7f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-12T13:40:29-07:00

Commit Message:
TSAGE: Fix for R2R canyon overhang reappearing after collapsed

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp
    engines/tsage/ringworld2/ringworld2_scenes1.h



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index c995509..0932c70 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1097,7 +1097,6 @@ void Scene1100::signal() {
 	// Really nothing
 		break;
 	case 13:
-		_leftImpacts.setup(1113, 2, 1);
 		_trooper.postInit();
 		R2_GLOBALS._scrollFollower = &_trooper;
 
@@ -1276,6 +1275,15 @@ void Scene1100::signal() {
 }
 
 void Scene1100::dispatch() {
+	// WORKAROUND: This fixes a problem with an overhang that gets blasted re-appearing
+	if (_animation._frame > 5 && _sceneMode == 13) {
+		_animation._endFrame = 9;
+		if (_animation._frame == 9)
+			// Use one of the scene's background scene objects to copy the scene to the background.
+			// This fixes the problem with the cliff overhang still appearing during the cutscene
+			_rightLandslide.copySceneToBackground();
+	}
+
 	if ((g_globals->_sceneObjects->contains(&_laserShot)) && (_laserShot._visage == 1102) && (_laserShot._strip == 4) && (_laserShot._frame == 1) && (_laserShot._flags & OBJFLAG_HIDING)) {
 		if (_paletteRefreshStatus == 1) {
 			_paletteRefreshStatus = 2;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 956328a..c008823 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -111,7 +111,7 @@ public:
 	SceneActor _shotImpact4;
 	SceneActor _shotImpact5;
 	SceneActor _laserShot;
-	SceneActor _animation;
+	SceneActor _animation;	// Used for cliff collapse and ship theft	
 	SceneActor _leftImpacts;
 	SceneActor _runningGuy1;
 	SceneActor _runningGuy2;