aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/talk.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-05-28 08:31:53 -0400
committerPaul Gilbert2015-05-28 08:31:53 -0400
commitf4902b516ec8486338b777354809171112671e5b (patch)
tree2d286bb33818babf3eade15e5babec8570ba3e7e /engines/sherlock/talk.cpp
parent45b4989b55a043a9d2f1806db375d9f91476ed89 (diff)
downloadscummvm-rg350-f4902b516ec8486338b777354809171112671e5b.tar.gz
scummvm-rg350-f4902b516ec8486338b777354809171112671e5b.tar.bz2
scummvm-rg350-f4902b516ec8486338b777354809171112671e5b.zip
SHERLOCK: Moving split up classes into their own files
Diffstat (limited to 'engines/sherlock/talk.cpp')
-rw-r--r--engines/sherlock/talk.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 5e9cb02a3d..dd6e776082 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -23,6 +23,7 @@
#include "sherlock/talk.h"
#include "sherlock/sherlock.h"
#include "sherlock/screen.h"
+#include "sherlock/scalpel/scalpel_user_interface.h"
namespace Sherlock {
@@ -547,7 +548,7 @@ void Talk::talkTo(const Common::String &filename) {
}
- ui._key = ui._oldKey = COMMANDS[TALK_MODE - 1];
+ ui._key = ui._oldKey = Scalpel::COMMANDS[TALK_MODE - 1];
ui._temp = ui._oldTemp = 0;
ui._menuMode = TALK_MODE;
_talkToFlag = 2;
@@ -784,9 +785,9 @@ void Talk::drawInterface() {
screen.makeButton(Common::Rect(181, CONTROLS_Y, 221, CONTROLS_Y + 10),
200 - screen.stringWidth("Down") / 2, "Down");
} else {
- int strWidth = screen.stringWidth(PRESS_KEY_TO_CONTINUE);
+ int strWidth = screen.stringWidth(Scalpel::PRESS_KEY_TO_CONTINUE);
screen.makeButton(Common::Rect(46, CONTROLS_Y, 273, CONTROLS_Y + 10),
- 160 - strWidth / 2, PRESS_KEY_TO_CONTINUE);
+ 160 - strWidth / 2, Scalpel::PRESS_KEY_TO_CONTINUE);
screen.gPrint(Common::Point(160 - strWidth / 2, CONTROLS_Y), COMMAND_FOREGROUND, "P");
}
}