[Scummvm-cvs-logs] scummvm master -> 1fc0140c32800d95ba1fe5cbbaac761b3a8ffd0b

dreammaster dreammaster at scummvm.org
Fri Sep 9 11:19:46 CEST 2011


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

Summary:
2fd13c48d2 TSAGE: Fix for properly clearing on-screen text
1fc0140c32 TSAGE: Fix to correctly show the heads of Blue Force speakers


Commit: 2fd13c48d2cf76330cb41ba5fa565b22d657be73
    https://github.com/scummvm/scummvm/commit/2fd13c48d2cf76330cb41ba5fa565b22d657be73
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-09T02:05:35-07:00

Commit Message:
TSAGE: Fix for properly clearing on-screen text

Changed paths:
    engines/tsage/core.cpp




Commit: 1fc0140c32800d95ba1fe5cbbaac761b3a8ffd0b
    https://github.com/scummvm/scummvm/commit/1fc0140c32800d95ba1fe5cbbaac761b3a8ffd0b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-09T02:06:07-07:00

Commit Message:
TSAGE: Fix to correctly show the heads of Blue Force speakers

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



diff --git a/engines/tsage/blue_force/blueforce_speakers.cpp b/engines/tsage/blue_force/blueforce_speakers.cpp
index 95a7372..58db865 100644
--- a/engines/tsage/blue_force/blueforce_speakers.cpp
+++ b/engines/tsage/blue_force/blueforce_speakers.cpp
@@ -150,7 +150,7 @@ void SpeakerSutter::setText(const Common::String &msg) {
 	_object2.setVisage(329);
 	_object2.setStrip2(1);
 	_object2.fixPriority(255);
-	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 45,
+	_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 45,
 		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
 
 	VisualSpeaker::setText(msg);
@@ -192,7 +192,7 @@ void SpeakerHarrison::setText(const Common::String &msg) {
 	_object2.fixPriority(255);
 	_object2.setVisage(325);
 	_object2.setStrip2(6);
-	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 277,
+	_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 277,
 		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
 
 	VisualSpeaker::setText(msg);
@@ -221,7 +221,7 @@ void SpeakerJakeJacket::setText(const Common::String &msg) {
 	_object2.setVisage(1001);
 	_object2.setStrip2(1);
 	_object2.fixPriority(255);
-	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + _xp,
+	_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + _xp,
 		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
 
 	VisualSpeaker::setText(msg);
@@ -250,7 +250,7 @@ void SpeakerJakeUniform::setText(const Common::String &msg) {
 	_object2.setVisage(1001);
 	_object2.setStrip2(1);
 	_object2.fixPriority(255);
-	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 45,
+	_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 45,
 		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
 
 	VisualSpeaker::setText(msg);
@@ -279,7 +279,7 @@ void SpeakerJailer::setText(const Common::String &msg) {
 	_object2.setVisage(395);
 	_object2.setStrip(5);
 	_object2.fixPriority(255);
-	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 40,
+	_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 40,
 		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
 
 	VisualSpeaker::setText(msg);






More information about the Scummvm-git-logs mailing list