[Scummvm-cvs-logs] scummvm master -> 24818c1877cd5ceb4696a720ad862bd6ecc77910

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
24818c1877 SHERLOCK: RT: Fix compiler warnings


Commit: 24818c1877cd5ceb4696a720ad862bd6ecc77910
    https://github.com/scummvm/scummvm/commit/24818c1877cd5ceb4696a720ad862bd6ecc77910
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-26T23:25:29-04:00

Commit Message:
SHERLOCK: RT: Fix compiler warnings

Changed paths:
    engines/sherlock/tattoo/widget_files.cpp
    engines/sherlock/tattoo/widget_options.cpp



diff --git a/engines/sherlock/tattoo/widget_files.cpp b/engines/sherlock/tattoo/widget_files.cpp
index c6edfa3..cf83bb3 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 5c09a01..574f6a8 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) };