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

[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:
e7df8b60e1 TSAGE: Disable saving in R2R when actors have been copied to the background


Commit: e7df8b60e15b4106a54eaff138316b6568d56517
    https://github.com/scummvm/scummvm/commit/e7df8b60e15b4106a54eaff138316b6568d56517
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-10T17:46:22-07:00

Commit Message:
TSAGE: Disable saving in R2R when actors have been copied to the background

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 488eacc..5261081 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2814,6 +2814,12 @@ void BackgroundSceneObject::setup2(int visage, int stripFrameNum, int frameNum,
 
 void BackgroundSceneObject::copySceneToBackground() {
 	GLOBALS._sceneManager._scene->_backSurface.copyFrom(g_globals->gfxManager().getSurface(), 0, 0);
+
+	// WORKAROUND: Since savegames don't store the active screen data, once we copy the 
+	// foreground objects to the background, we have to prevent the scene being saved.
+	// I do this the easiest way, by using the existing animationCtr global
+	if (g_vm->getGameID() == GType_Ringworld2)
+		++R2_GLOBALS._animationCtr;
 }
 
 /*--------------------------------------------------------------------------*/