[Scummvm-cvs-logs] scummvm master -> 663044f095d9c3290149d426d68b7da0f5c26683

dreammaster dreammaster at scummvm.org
Sat Apr 9 21:17:22 CEST 2016


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:
663044f095 SHERLOCK: RT: Fix crasah showing items to Rose Hanchem


Commit: 663044f095d9c3290149d426d68b7da0f5c26683
    https://github.com/scummvm/scummvm/commit/663044f095d9c3290149d426d68b7da0f5c26683
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-04-09T15:17:17-04:00

Commit Message:
SHERLOCK: RT: Fix crasah showing items to Rose Hanchem

Changed paths:
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index b543472..3c6bf44 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -28,9 +28,11 @@
 #include "sherlock/scalpel/scalpel_talk.h"
 #include "sherlock/scalpel/scalpel_user_interface.h"
 #include "sherlock/tattoo/tattoo.h"
+#include "sherlock/tattoo/tattoo_fixed_text.h"
 #include "sherlock/tattoo/tattoo_people.h"
 #include "sherlock/tattoo/tattoo_scene.h"
 #include "sherlock/tattoo/tattoo_talk.h"
+#include "sherlock/tattoo/tattoo_user_interface.h"
 
 namespace Sherlock {
 
@@ -306,8 +308,14 @@ void Talk::talkTo(const Common::String filename) {
 	if (_scriptMoreFlag && _scriptSelect != 100)
 		select = _scriptSelect;
 
-	if (select == -1)
+	if (select == -1) {
+		if (IS_ROSE_TATTOO) {
+			static_cast<Tattoo::TattooUserInterface *>(&ui)->putMessage(
+				"%s", _vm->_fixedText->getText(Tattoo::kFixedText_NoEffect));
+			return;
+		}
 		error("Couldn't find statement to display");
+	}
 
 	// Add the statement into the journal and talk history
 	if (_talkTo != -1 && !_talkHistory[_converseNum][select])






More information about the Scummvm-git-logs mailing list