[Scummvm-git-logs] scummvm master -> 31ffa223876130532351a4394e32b2f311b38104

eriktorbjorn eriktorbjorn at telia.com
Sat Sep 24 09:35:17 CEST 2016


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:
31ffa22387 MACVENTURE: Silence Cppcheck warning


Commit: 31ffa223876130532351a4394e32b2f311b38104
    https://github.com/scummvm/scummvm/commit/31ffa223876130532351a4394e32b2f311b38104
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-09-24T09:34:28+02:00

Commit Message:
MACVENTURE: Silence Cppcheck warning

I think it was harmless, but don't use 'it' after erasing it.

Changed paths:
    engines/macventure/gui.cpp



diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp
index 14c99f6..9e0a6e9 100644
--- a/engines/macventure/gui.cpp
+++ b/engines/macventure/gui.cpp
@@ -1129,12 +1129,11 @@ Common::Point Gui::localizeTravelledDistance(Common::Point point, WindowReferenc
 
 void Gui::removeInventoryWindow(WindowReference ref) {
 	_inventoryWindows.remove_at(ref - kInventoryStart);
-	bool found = false;
 	Common::List<WindowData>::iterator it;
-	for (it = _windowData->begin(); it != _windowData->end() && !found; it++) {
+	for (it = _windowData->begin(); it != _windowData->end(); it++) {
 		if (it->refcon == ref) {
 			_windowData->erase(it);
-			found = true;
+			break;
 		}
 	}
 }





More information about the Scummvm-git-logs mailing list