[Scummvm-cvs-logs] scummvm master -> e3f81c267b5ef08838734baa31e84bec9ee7fb3d

dreammaster dreammaster at scummvm.org
Tue Nov 17 00:52:11 CET 2015


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:
e3f81c267b SHERLOCK: RT: Fix Coverity warning in original savegame dialog


Commit: e3f81c267b5ef08838734baa31e84bec9ee7fb3d
    https://github.com/scummvm/scummvm/commit/e3f81c267b5ef08838734baa31e84bec9ee7fb3d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-11-16T18:51:33-05:00

Commit Message:
SHERLOCK: RT: Fix Coverity warning in original savegame dialog

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



diff --git a/engines/sherlock/tattoo/widget_files.cpp b/engines/sherlock/tattoo/widget_files.cpp
index 0f5e679..ca5e1bf 100644
--- a/engines/sherlock/tattoo/widget_files.cpp
+++ b/engines/sherlock/tattoo/widget_files.cpp
@@ -143,19 +143,17 @@ void WidgetFiles::render(FilesRenderMode mode) {
 	int yp = _surface.fontHeight() + 14;
 	
 	for (int idx = _savegameIndex; idx < (_savegameIndex + FILES_LINES_COUNT); ++idx) {
-		if (OP_NAMES || idx == _selector || idx == _oldSelector) {
-			if (idx == _selector && mode != RENDER_ALL)
-				color = COMMAND_HIGHLIGHTED;
-			else
-				color = INFO_TOP;
+		if (idx == _selector && mode != RENDER_ALL)
+			color = COMMAND_HIGHLIGHTED;
+		else
+			color = INFO_TOP;
 
-			if (mode == RENDER_NAMES_AND_SCROLLBAR)
-				_surface.fillRect(Common::Rect(4, yp, _surface.w() - BUTTON_SIZE - 9, yp + _surface.fontHeight()), TRANSPARENCY);
+		if (mode == RENDER_NAMES_AND_SCROLLBAR)
+			_surface.fillRect(Common::Rect(4, yp, _surface.w() - BUTTON_SIZE - 9, yp + _surface.fontHeight()), TRANSPARENCY);
 			
-			Common::String numStr = Common::String::format("%d.", idx + 1);
-			_surface.writeString(numStr, Common::Point(_surface.widestChar(), yp), color);
-			_surface.writeString(_savegames[idx], Common::Point(xp, yp), color);
-		}
+		Common::String numStr = Common::String::format("%d.", idx + 1);
+		_surface.writeString(numStr, Common::Point(_surface.widestChar(), yp), color);
+		_surface.writeString(_savegames[idx], Common::Point(xp, yp), color);
 
 		yp += _surface.fontHeight() + 1;
 	}






More information about the Scummvm-git-logs mailing list