[Scummvm-git-logs] scummvm master -> 35cf41683e55a3d1a6756bd689ef69d565821f5a

[antoniou79]

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:
35cf41683e BLADERUNNER: fix wanring for clearNeverRepeatWasSelectedFlag


Commit: 35cf41683e55a3d1a6756bd689ef69d565821f5a
    https://github.com/scummvm/scummvm/commit/35cf41683e55a3d1a6756bd689ef69d565821f5a
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-06-25T15:44:27+03:00

Commit Message:
BLADERUNNER: fix wanring for clearNeverRepeatWasSelectedFlag

Changed paths:
    engines/bladerunner/dialogue_menu.cpp
    engines/bladerunner/dialogue_menu.h


diff --git a/engines/bladerunner/dialogue_menu.cpp b/engines/bladerunner/dialogue_menu.cpp
index cdf7246..09e34dc 100644
--- a/engines/bladerunner/dialogue_menu.cpp
+++ b/engines/bladerunner/dialogue_menu.cpp
@@ -144,7 +144,7 @@ bool DialogueMenu::addToList(int answer, bool done, int priorityPolite, int prio
 }
 
 /**
-* Aux funtion - used in cut content mode to re-use some NeverRepeatOnceSelected dialogue options for different characters
+* Aux function - used in cut content mode to re-use some NeverRepeatOnceSelected dialogue options for different characters
 */
 bool DialogueMenu::clearNeverRepeatWasSelectedFlag(int answer) {
 	int foundIndex = -1;
@@ -157,7 +157,9 @@ bool DialogueMenu::clearNeverRepeatWasSelectedFlag(int answer) {
 
 	if (foundIndex >= 0 && _neverRepeatWasSelected[foundIndex]) {
 		_neverRepeatWasSelected[foundIndex] = false;
+		return true;
 	}
+	return false;
 }
 
 bool DialogueMenu::addToListNeverRepeatOnceSelected(int answer, int priorityPolite, int priorityNormal, int prioritySurly) {
diff --git a/engines/bladerunner/dialogue_menu.h b/engines/bladerunner/dialogue_menu.h
index 7f0019c..4cb7c4f 100644
--- a/engines/bladerunner/dialogue_menu.h
+++ b/engines/bladerunner/dialogue_menu.h
@@ -88,7 +88,7 @@ public:
 	bool show();
 	bool hide();
 	bool addToList(int answer, bool done, int priorityPolite, int priorityNormal, int prioritySurly);
-	bool clearNeverRepeatWasSelectedFlag(int answer); // aux funtion - used in cut content mode to re-use some dialogue options for different characters
+	bool clearNeverRepeatWasSelectedFlag(int answer); // aux function - used in cut content mode to re-use some dialogue options for different characters
 	bool addToListNeverRepeatOnceSelected(int answer, int priorityPolite, int priorityNormal, int prioritySurly);
 	bool removeFromList(int answer);
 	bool clearList();