[Scummvm-cvs-logs] scummvm master -> 15c1d2d6c1cd8686e36ce338ba93bf27f8defd4c
dreammaster
dreammaster at scummvm.org
Sat Sep 24 07:47:14 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:
d755d40150 TSAGE: Bugfix for partner arriving on-screen incorrectly
15c1d2d6c1 TSAGE: Bugfix for Blue Force conversation sequences launched on the player object
Commit: d755d40150023dc8ec6d5c474b3f20f6325ad15c
https://github.com/scummvm/scummvm/commit/d755d40150023dc8ec6d5c474b3f20f6325ad15c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-23T22:40:19-07:00
Commit Message:
TSAGE: Bugfix for partner arriving on-screen incorrectly
Changed paths:
engines/tsage/blue_force/blueforce_scenes3.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index e7d89f6..5bd62a9 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -2049,7 +2049,7 @@ void Scene340::postInit(SceneObjectList *OwnerList) {
_harrison.setVisage(326);
_harrison.setObjectWrapper(new SceneObjectWrapper());
_harrison.animate(ANIM_MODE_1, NULL);
- _harrison.setPosition(Common::Point(-40, 219));
+ _harrison.setPosition(Common::Point(-60, 219));
BF_GLOBALS._sceneItems.push_back(&_harrison);
_stripManager.addSpeaker(&_harrisonSpeaker);
Commit: 15c1d2d6c1cd8686e36ce338ba93bf27f8defd4c
https://github.com/scummvm/scummvm/commit/15c1d2d6c1cd8686e36ce338ba93bf27f8defd4c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-23T22:41:11-07:00
Commit Message:
TSAGE: Bugfix for Blue Force conversation sequences launched on the player object
Changed paths:
engines/tsage/core.cpp
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index b8d1c8d..733f270 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -3878,10 +3878,10 @@ void SceneHandler::process(Event &event) {
// Handle any fallback text display
processEnd(event);
-
- // Handle player processing
- _globals->_player.process(event);
}
+
+ // Handle player processing
+ _globals->_player.process(event);
}
}
More information about the Scummvm-git-logs
mailing list