diff --git a/engines/stark/resources/dialog.cpp b/engines/stark/resources/dialog.cpp index ef94bb4d4d7..7eedcbd5292 100644 --- a/engines/stark/resources/dialog.cpp +++ b/engines/stark/resources/dialog.cpp @@ -259,31 +259,48 @@ Speech *Dialog::Reply::getCurrentSpeech() { } bool Dialog::Reply::checkCondition() const { + bool result; + switch (_conditionType) { case kConditionTypeAlways: - return true; + result = true; + break; case kConditionTypeNoOtherOptions: - return true; // Will be removed from to the options later if some other options are available + result = true; // Will be removed from to the options later if some other options are available + break; case kConditionTypeHasItem: { Item *item = _conditionReference.resolve(); - return item->isEnabled(); + result = item->isEnabled(); + break; } case kConditionTypeCheckValue4: case kConditionTypeCheckValue5: { Knowledge *condition = _conditionReference.resolve(); - return condition->getBooleanValue(); + result = condition->getBooleanValue(); + break; } case kConditionTypeRunScriptCheckValue: { Script *conditionScript = _conditionScriptReference.resolve