[Scummvm-cvs-logs] scummvm master -> 55f9c364bcd717e3ae2b6c2b4effd942c930968e

dreammaster dreammaster at scummvm.org
Thu Aug 27 14:30:39 CEST 2015


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:
e96a302b74 SHERLOCK: RT: Fix incorrect Watson movement at Aerodrome scene
55f9c364bc SHERLOCK: RT: Fix talkTo filename getting changed mid-script


Commit: e96a302b74e70b862034cfbfb81af6093094d97d
    https://github.com/scummvm/scummvm/commit/e96a302b74e70b862034cfbfb81af6093094d97d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-27T08:18:46-04:00

Commit Message:
SHERLOCK: RT: Fix incorrect Watson movement at Aerodrome scene

Changed paths:
    engines/sherlock/tattoo/tattoo_people.cpp



diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index 5cb6c4c..bd2ed0e 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -1486,7 +1486,7 @@ const Common::Point TattooPeople::restrictToZone(int zoneId, const Common::Point
 	else if (destPos.x < r.left && r.top < destPos.y && destPos.y < r.bottom)
 		return Common::Point(r.left, destPos.y);
 	else if (destPos.x > r.right && r.top < destPos.y && destPos.y < r.bottom)
-		return Common::Point(r.bottom, destPos.y);
+		return Common::Point(r.right, destPos.y);
 
 	// Find which corner of the zone the point is closet to
 	if (destPos.x <= r.left) {


Commit: 55f9c364bcd717e3ae2b6c2b4effd942c930968e
    https://github.com/scummvm/scummvm/commit/55f9c364bcd717e3ae2b6c2b4effd942c930968e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-27T08:28:32-04:00

Commit Message:
SHERLOCK: RT: Fix talkTo filename getting changed mid-script

Calls to cmdPauseWithoutControl can allow a second script to run,
with it's own filename. This shouldn't change the filename for
the outer call to talkTo

Changed paths:
    engines/sherlock/talk.cpp
    engines/sherlock/talk.h



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 010bb3d..d0c74f8 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -647,7 +647,7 @@ void Talk::pushSequence(int speaker) {
 	}
 }
 
-void Talk::doScript(const Common::String &script) {
+void Talk::doScript(const Common::String script) {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 694ac08..b3868d7 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -289,7 +289,7 @@ public:
 	 * Parses a reply for control codes and display text. The found text is printed within
 	 * the text window, handles delays, animations, and animating portraits.
 	 */
-	void doScript(const Common::String &script);
+	void doScript(const Common::String script);
 
 	/**
 	 * Main method for handling conversations when a character to talk to has been






More information about the Scummvm-git-logs mailing list