KOTOR: Fix regression in interaction with placeables

xoreos · Mar 5, 2019 · f8b7895 · f8b7895
1 parent 324ad3d
commit f8b7895
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/engines/kotorbase/actionexecutor.cpp b/src/engines/kotorbase/actionexecutor.cpp
@@ -144,21 +144,19 @@ void ActionExecutor::executeUseObject(const Action &action, const ExecutionConte
 		return;
 	}
 
-	Placeable *placeable = ObjectContainer::toPlaceable(action.object);
-	if (placeable) {
-		if (placeable->hasInventory())
-			module->delayContainer(placeable);
-
-		return;
-	}
-
 	Situated *situated = ObjectContainer::toSituated(action.object);
 	if (situated) {
 		const Common::UString conversation = situated->getConversation();
-		if (!conversation.empty())
+		if (!conversation.empty()) {
 			module->delayConversation(conversation, situated);
+			return;
+		}
 
-		return;
+		Placeable *placeable = ObjectContainer::toPlaceable(action.object);
+		if (placeable && placeable->hasInventory()) {
+			module->delayContainer(placeable);
+			return;
+		}
 	}
 }