libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 20:17:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: RT: Fix compiler warnings

Browse Source
This commit is contained in:
Paul Gilbert 2015-06-25 20:50:58 -04:00
parent 92ac962718
commit 27673dbe24
6 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/sherlock/scalpel/scalpel.h
View File

@ -31,6 +31,7 @@ namespace Sherlock {
namespace Scalpel {
enum {
COMMAND_FOREGROUND = 15,
COMMAND_HIGHLIGHTED = 10,
COMMAND_NULL = 248
};

1
engines/sherlock/screen.h
View File

@ -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,

1
engines/sherlock/tattoo/tattoo.h
View File

@ -34,6 +34,7 @@ enum {
INFO_MIDDLE = 186,
INFO_BOTTOM = 188,
MENU_BACKGROUND = 225,
COMMAND_FOREGROUND = 15,
COMMAND_HIGHLIGHTED = 254,
COMMAND_NULL = 193

3
engines/sherlock/tattoo/tattoo_journal.cpp
View File

@ -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;

3
engines/sherlock/tattoo/tattoo_user_interface.cpp
View File

@ -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);

2
engines/sherlock/tattoo/widget_base.cpp
View File

@ -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