diff options
author | Paul Gilbert | 2015-06-25 21:36:26 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-06-25 21:36:26 -0400 |
commit | 9bbeaa668a559be34638c579310d0e832a278c6d (patch) | |
tree | e1d02a6ed65cca8ea5b39c9e27919c59d3b961b6 /engines/sherlock/objects.cpp | |
parent | 6d35a547ad86977b67077c5e8069b3679828a09b (diff) | |
download | scummvm-rg350-9bbeaa668a559be34638c579310d0e832a278c6d.tar.gz scummvm-rg350-9bbeaa668a559be34638c579310d0e832a278c6d.tar.bz2 scummvm-rg350-9bbeaa668a559be34638c579310d0e832a278c6d.zip |
SHERLOCK: RT: Set up new values for color constants
Diffstat (limited to 'engines/sherlock/objects.cpp')
-rw-r--r-- | engines/sherlock/objects.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index ac5296c79e..79822623d2 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -21,12 +21,13 @@ */ #include "common/util.h" -#include "sherlock/sherlock.h" #include "sherlock/objects.h" #include "sherlock/people.h" #include "sherlock/scene.h" +#include "sherlock/scalpel/scalpel.h" #include "sherlock/scalpel/scalpel_map.h" #include "sherlock/scalpel/scalpel_people.h" +#include "sherlock/tattoo/tattoo.h" namespace Sherlock { @@ -546,13 +547,13 @@ int BaseObject::checkNameForCodes(const Common::String &name, FixedTextActionId ui._infoFlag = true; ui.clearInfo(); Common::String errorMessage = fixedText.getActionMessage(fixedTextActionId, messageNum); - screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", errorMessage.c_str()); + screen.print(Common::Point(0, INFO_LINE + 1), COL_INFO_FOREGROUND, "%s", errorMessage.c_str()); ui._menuCounter = 25; } else if (name.hasPrefix("@")) { // Message attached to canimation ui._infoFlag = true; ui.clearInfo(); - screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", name.c_str() + 1); + screen.print(Common::Point(0, INFO_LINE + 1), COL_INFO_FOREGROUND, "%s", name.c_str() + 1); printed = true; ui._menuCounter = 25; } @@ -1321,7 +1322,7 @@ int Object::pickUpObject(FixedTextActionId fixedTextActionId) { ui._infoFlag = true; ui.clearInfo(); Common::String errorMessage = fixedText.getActionMessage(fixedTextActionId, message); - screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", errorMessage.c_str()); + screen.print(Common::Point(0, INFO_LINE + 1), COL_INFO_FOREGROUND, "%s", errorMessage.c_str()); ui._menuCounter = 30; } else { // Pick it up @@ -1370,7 +1371,7 @@ int Object::pickUpObject(FixedTextActionId fixedTextActionId) { Common::String itemName = _description; itemName.setChar(tolower(itemName[0]), 0); - screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "Picked up %s", itemName.c_str()); + screen.print(Common::Point(0, INFO_LINE + 1), COL_INFO_FOREGROUND, "Picked up %s", itemName.c_str()); ui._menuCounter = 25; } } |