[Scummvm-git-logs] scummvm master -> 7b303ad94668690a1defb25ea72afc0d5cacb958

[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:
7b303ad946 BLADERUNNER: Dialogue menu bugfix


Commit: 7b303ad94668690a1defb25ea72afc0d5cacb958
    https://github.com/scummvm/scummvm/commit/7b303ad94668690a1defb25ea72afc0d5cacb958
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-02-23T16:34:10+02:00

Commit Message:
BLADERUNNER: Dialogue menu bugfix

Fixes loops in conversations with user choices available

Changed paths:
    engines/bladerunner/dialogue_menu.cpp


diff --git a/engines/bladerunner/dialogue_menu.cpp b/engines/bladerunner/dialogue_menu.cpp
index 17bd9c2..61f400c 100644
--- a/engines/bladerunner/dialogue_menu.cpp
+++ b/engines/bladerunner/dialogue_menu.cpp
@@ -142,7 +142,7 @@ bool DialogueMenu::addToListNeverRepeatOnceSelected(int answer, int priorityPoli
 		}
 	}
 
-	if (foundIndex > 0 && _neverRepeatWasSelected[foundIndex]) {
+	if (foundIndex >= 0 && _neverRepeatWasSelected[foundIndex]) {
 		return true;
 	}
 
@@ -181,14 +181,14 @@ int DialogueMenu::queryInput() {
 	int answer = -1;
 	if (_listSize == 1) {
 		_selectedItemIndex = 0;
-		answer = _items[0].answerValue;
+		answer = _items[_selectedItemIndex].answerValue;
 	} else if (_listSize == 2) {
 		if (_items[0].isDone) {
 			_selectedItemIndex = 1;
-			answer = _items[0].answerValue;
+			answer = _items[_selectedItemIndex].answerValue;
 		} else if (_items[1].isDone) {
 			_selectedItemIndex = 0;
-			answer = _items[1].answerValue;
+			answer = _items[_selectedItemIndex].answerValue;
 		}
 	}