[Scummvm-cvs-logs] scummvm master -> 453323ebaa876b12c8d9d3dbf1da6e79e1ec1db1

dreammaster dreammaster at scummvm.org
Sat Oct 15 11:45:21 CEST 2011


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:
453323ebaa TSAGE: Fixed accidental recursion in FollowerObject::reposition method


Commit: 453323ebaa876b12c8d9d3dbf1da6e79e1ec1db1
    https://github.com/scummvm/scummvm/commit/453323ebaa876b12c8d9d3dbf1da6e79e1ec1db1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-15T02:30:05-07:00

Commit Message:
TSAGE: Fixed accidental recursion in FollowerObject::reposition method

Changed paths:
    engines/tsage/blue_force/blueforce_logic.cpp



diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 22e50bb..537020e 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -601,7 +601,7 @@ void FollowerObject::reposition() {
 	assert(_object);
 	setStrip(_object->_strip);
 	setPosition(_object->_position, _object->_yDiff);
-	reposition();
+	NamedObject::reposition();
 }
 
 void FollowerObject::setup(SceneObject *object, int visage, int frameNum, int yDiff) {






More information about the Scummvm-git-logs mailing list