KOTOR: Separate character selection and exit script

xoreos · Sep 13, 2018 · 467c1e5 · 467c1e5
1 parent 8182ecc
commit 467c1e5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/engines/kotor/module.cpp b/src/engines/kotor/module.cpp
@@ -799,7 +799,7 @@ void Module::switchPlayerCharacter(int npc) {
 	}
 }
 
-void Module::showPartySelectionGUI(const Common::UString &exitScript, int forceNPC1, int forceNPC2) {
+void Module::showPartySelectionGUI(int forceNPC1, int forceNPC2) {
 	if (_inDialog)
 		_dialog->hide();
 	else
@@ -846,8 +846,6 @@ void Module::showPartySelectionGUI(const Common::UString &exitScript, int forceN
 
 	if (npc1 != -1)
 		addToParty(new Creature(_availableParty[npc1]));
-
-	runScript(exitScript);
 }
 
 void Module::addAvailablePartyMember(int slot, const Common::UString &templ) {

diff --git a/src/engines/kotor/module.h b/src/engines/kotor/module.h
@@ -130,7 +130,7 @@ class Module : public KotOR::Object, public KotOR::ObjectContainer {
 	/** Switch the player character. */
 	void switchPlayerCharacter(int npc);
 	/** Show the party selection GUI. */
-	void showPartySelectionGUI(const Common::UString &exitScript, int forceNPC1 = -1, int forceNPC2 = -1);
+	void showPartySelectionGUI(int forceNPC1, int forceNPC2);
 	/** Add available party member by template. */
 	void addAvailablePartyMember(int slot, const Common::UString &templ);
 	/** Check if there is a party member available for this id. */

diff --git a/src/engines/kotor/script/functions_party.cpp b/src/engines/kotor/script/functions_party.cpp
@@ -61,7 +61,8 @@ void Functions::showPartySelectionGUI(Aurora::NWScript::FunctionContext &ctx) {
 	int forceNPC1 = ctx.getParams()[1].getInt();
 	int forceNPC2 = ctx.getParams()[2].getInt();
 
-	_game->getModule().showPartySelectionGUI(exitScript, forceNPC1, forceNPC2);
+	_game->getModule().showPartySelectionGUI(forceNPC1, forceNPC2);
+	ScriptContainer::runScript(exitScript, ctx.getCaller(), ctx.getTriggerer());
 }
 
 void Functions::isAvailableCreature(Aurora::NWScript::FunctionContext &ctx) {