diff options
| author | Paul Gilbert | 2015-07-26 23:25:29 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-07-26 23:25:29 -0400 |
| commit | 24818c1877cd5ceb4696a720ad862bd6ecc77910 (patch) | |
| tree | 8f647921c3c3a47a9bb7d87d792c1d1b0c09b0ec /engines | |
| parent | 543f655bec7c068d6c4091ca57107c9ba201ed00 (diff) | |
| download | scummvm-rg350-24818c1877cd5ceb4696a720ad862bd6ecc77910.tar.gz scummvm-rg350-24818c1877cd5ceb4696a720ad862bd6ecc77910.tar.bz2 scummvm-rg350-24818c1877cd5ceb4696a720ad862bd6ecc77910.zip | |
SHERLOCK: RT: Fix compiler warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sherlock/tattoo/widget_files.cpp | 9 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/widget_options.cpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/engines/sherlock/tattoo/widget_files.cpp b/engines/sherlock/tattoo/widget_files.cpp index c6edfa30dc..cf83bb3316 100644 --- a/engines/sherlock/tattoo/widget_files.cpp +++ b/engines/sherlock/tattoo/widget_files.cpp @@ -106,7 +106,7 @@ void WidgetFiles::render(FilesRenderMode mode) { ImageFile &images = *ui._interfaceImages; byte color; - if (mode == OP_ALL) { + if (mode == RENDER_ALL) { _surface.fill(TRANSPARENCY); makeInfoArea(); @@ -144,7 +144,7 @@ void WidgetFiles::render(FilesRenderMode mode) { for (int idx = _savegameIndex; idx < (_savegameIndex + FILES_LINES_COUNT); ++idx) { if (OP_NAMES || idx == _selector || idx == _oldSelector) { - if (idx == _selector && mode != OP_ALL) + if (idx == _selector && mode != RENDER_ALL) color = COMMAND_HIGHLIGHTED; else color = INFO_TOP; @@ -230,7 +230,7 @@ void WidgetFiles::handleEvents() { _outsideMenu = false; if (_selector != -1) { - if (_fileMode = SAVEMODE_LOAD) { + if (_fileMode == SAVEMODE_LOAD) { // We're in Load Mode _vm->loadGameState(_selector); } else if (_fileMode == SAVEMODE_SAVE) { @@ -364,6 +364,9 @@ bool WidgetFiles::getFilename() { --index; } break; + + default: + break; } } else if (keyState.keycode == Common::KEYCODE_INSERT) { insert = !insert; diff --git a/engines/sherlock/tattoo/widget_options.cpp b/engines/sherlock/tattoo/widget_options.cpp index 5c09a016b9..574f6a896f 100644 --- a/engines/sherlock/tattoo/widget_options.cpp +++ b/engines/sherlock/tattoo/widget_options.cpp @@ -239,11 +239,9 @@ void WidgetOptions::handleEvents() { void WidgetOptions::render(OptionRenderMode mode) { TattooEngine &vm = *(TattooEngine *)_vm; - Events &events = *_vm->_events; Music &music = *_vm->_music; Sound &sound = *_vm->_sound; TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui; - Common::Point mousePos = events.mousePos(); ImageFile &images = *ui._interfaceImages; const char *const OFF_ON[2] = { FIXED(Off), FIXED(On) }; |