6 files changed, 3 insertions, 8 deletions
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 0747e7d8f8..a2a1cbba63 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -31,6 +31,7 @@ namespace Sherlock {
 namespace Scalpel {
 
 enum {
+	COMMAND_FOREGROUND	= 15,
 	COMMAND_HIGHLIGHTED = 10,
 	COMMAND_NULL		= 248
 };
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index b67361e339..8b6198d480 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -44,7 +44,6 @@ enum {
 	BORDER_COLOR		= 237,
 	INV_FOREGROUND		= 14,
 	INV_BACKGROUND		= 1,
-	COMMAND_FOREGROUND	= 15,
 	COMMAND_BACKGROUND	= 4,
 	BUTTON_TOP			= 233,
 	BUTTON_MIDDLE		= 244,
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
index aa07d857c4..d4f20bb0a0 100644
--- a/engines/sherlock/tattoo/tattoo.h
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -34,6 +34,7 @@ enum {
 	INFO_MIDDLE			= 186,
 	INFO_BOTTOM			= 188,
 	MENU_BACKGROUND		= 225,
+	COMMAND_FOREGROUND	= 15,
 	COMMAND_HIGHLIGHTED	= 254,
 	COMMAND_NULL		= 193
 
diff --git a/engines/sherlock/tattoo/tattoo_journal.cpp b/engines/sherlock/tattoo/tattoo_journal.cpp
index e3f681bc3c..ac8d9cdecc 100644
--- a/engines/sherlock/tattoo/tattoo_journal.cpp
+++ b/engines/sherlock/tattoo/tattoo_journal.cpp
@@ -81,7 +81,6 @@ void TattooJournal::show() {
 
 	do {
 		events.pollEventsAndWait();
-		Common::Point mousePos = events.mousePos();
 		_wait = true;
 
 		handleKeyboardEvents();
@@ -631,10 +630,8 @@ void TattooJournal::highlightSearchControls(bool slamIt) {
 }
 
 void TattooJournal::drawScrollBar() {
-	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
-	Common::Point mousePos = events.mousePos();
 	bool raised;
 	byte color;
 
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index ade9861c4c..cbd9c6168f 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -586,9 +586,6 @@ void TattooUserInterface::freeMenu() {
 }
 
 void TattooUserInterface::putMessage(const char *formatStr, ...) {
-	Events &events = *_vm->_events;
-	Common::Point mousePos = events.mousePos();
-
 	// Create the string to display
 	va_list args;
 	va_start(args, formatStr);
diff --git a/engines/sherlock/tattoo/widget_base.cpp b/engines/sherlock/tattoo/widget_base.cpp
index b9bc0b12d5..b3c089bf6a 100644
--- a/engines/sherlock/tattoo/widget_base.cpp
+++ b/engines/sherlock/tattoo/widget_base.cpp
@@ -142,7 +142,7 @@ Common::String WidgetBase::splitLines(const Common::String &str, Common::StringA
 		// Move the string ahead to the next line
 		if (*strP == ' ' || *strP == 13)
 			++strP;
-	} while (*strP && ((int)lines.size() < maxLines) && ((byte)*strP < talk._opcodes[OP_SWITCH_SPEAKER] 
+	} while (*strP && (lines.size() < maxLines) && ((byte)*strP < talk._opcodes[OP_SWITCH_SPEAKER] 
 			|| (byte)*strP == talk._opcodes[OP_NULL]));
 
 	// Return any remaining text left over