[Scummvm-cvs-logs] scummvm master -> 6b61eb62ab8f672be35ced69aa18e9793eb27772

[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:
6b61eb62ab TSAGE: R2R fix for zoomed speaking characters appearing correctly


Commit: 6b61eb62ab8f672be35ced69aa18e9793eb27772
    https://github.com/scummvm/scummvm/commit/6b61eb62ab8f672be35ced69aa18e9793eb27772
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-28T12:00:44-08:00

Commit Message:
TSAGE: R2R fix for zoomed speaking characters appearing correctly

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 0c17bf9..596f056 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2748,6 +2748,12 @@ GfxSurface SceneObject::getFrame() {
 }
 
 void SceneObject::reposition() {
+	if (g_vm->getGameID() == GType_Ringworld2) {
+		if (!(_flags & OBJFLAG_ZOOMED)) {
+			setZoom(g_globals->_sceneManager._scene->_zoomPercents[MIN(_position.y, (int16)255)]);
+		}
+	}
+
 	GfxSurface frame = getFrame();
 
 	_bounds.resize(frame, _position.x, _position.y - _yDiff, _percent);