ENGINES: Add support for NPC initiated conversations in KotOR 1/2

xoreos · Jun 24, 2018 · a3d4d7c · a3d4d7c
1 parent 9d55354
commit a3d4d7c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/src/engines/kotor/module.cpp b/src/engines/kotor/module.cpp
@@ -855,10 +855,21 @@ void Module::loadSavedGame(SavedGame *save) {
 }
 
 void Module::startConversation(const Common::UString &name, Aurora::NWScript::Object *owner) {
-	if (_inDialog || name.empty())
+	if (_inDialog)
 		return;
 
-	_dialog->startConversation(name, owner);
+	Common::UString finalName(name);
+
+	if (finalName.empty() && owner) {
+		Creature *creature = ObjectContainer::toCreature(owner);
+		if (creature)
+			finalName = creature->getConversation();
+	}
+
+	if (finalName.empty())
+		return;
+
+	_dialog->startConversation(finalName, owner);
 
 	if (_dialog->isConversationActive()) {
 		stopCameraMovement();

diff --git a/src/engines/kotor2/module.cpp b/src/engines/kotor2/module.cpp
@@ -714,10 +714,21 @@ void Module::toggleTriggers() {
 }
 
 void Module::startConversation(const Common::UString &name, Aurora::NWScript::Object *owner) {
-	if (_inDialog || name.empty())
+	if (_inDialog)
 		return;
 
-	_dialog->startConversation(name, owner);
+	Common::UString finalName(name);
+
+	if (finalName.empty() && owner) {
+		Creature *creature = ObjectContainer::toCreature(owner);
+		if (creature)
+			finalName = creature->getConversation();
+	}
+
+	if (finalName.empty())
+		return;
+
+	_dialog->startConversation(finalName, owner);
 
 	if (_dialog->isConversationActive()) {
 		_ingame->hide();