KOTOR: Add getPartyMemberByIndex nwscript function

xoreos · Sep 13, 2018 · 8182ecc · 8182ecc
1 parent 9a9b5ee
commit 8182ecc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/src/engines/kotor/module.cpp b/src/engines/kotor/module.cpp
@@ -761,6 +761,15 @@ bool Module::isObjectPartyMember(Creature *creature) {
 	return std::find(_party.begin(), _party.end(), creature) != _party.end();
 }
 
+Creature *Module::getPartyMember(int index) {
+	if (index >= static_cast<int>(_party.size()) || index < 0)
+		throw Common::Exception("Module::getPartyMember() Invalid index");
+
+	std::list<Creature *>::iterator iter = _party.begin();
+	std::advance(iter, index);
+	return *iter;
+}
+
 void Module::switchPlayerCharacter(int npc) {
 	std::list<Creature *>::iterator iter = _party.begin();
 	if (npc != -1)

diff --git a/src/engines/kotor/module.h b/src/engines/kotor/module.h
@@ -125,6 +125,8 @@ class Module : public KotOR::Object, public KotOR::ObjectContainer {
 	void addToParty(Creature *creature);
 	/** Check if the specified creature is a party member. */
 	bool isObjectPartyMember(Creature *creature);
+	/** Get a party member by index. */
+	Creature *getPartyMember(int index);
 	/** Switch the player character. */
 	void switchPlayerCharacter(int npc);
 	/** Show the party selection GUI. */

diff --git a/src/engines/kotor/script/function_tables.h b/src/engines/kotor/script/function_tables.h
@@ -695,7 +695,7 @@ const Functions::FunctionPointer Functions::kFunctionPointers[] = {
 	{ 574, "AddPartyMember"                      , 0                                                },
 	{ 575, "RemovePartyMember"                   , 0                                                },
 	{ 576, "IsObjectPartyMember"                 , &Functions::isObjectPartyMember                  },
-	{ 577, "GetPartyMemberByIndex"               , 0                                                },
+	{ 577, "GetPartyMemberByIndex"               , &Functions::getPartyMemberByIndex                },
 	{ 578, "GetGlobalBoolean"                    , &Functions::getGlobalBoolean                     },
 	{ 579, "SetGlobalBoolean"                    , &Functions::setGlobalBoolean                     },
 	{ 580, "GetGlobalNumber"                     , &Functions::getGlobalNumber                      },

diff --git a/src/engines/kotor/script/functions.h b/src/engines/kotor/script/functions.h
@@ -267,6 +267,7 @@ class Functions {
 
 	// .--- Party, functions_party.cpp
 	void isObjectPartyMember(Aurora::NWScript::FunctionContext &ctx);
+	void getPartyMemberByIndex(Aurora::NWScript::FunctionContext &ctx);
 	void showPartySelectionGUI(Aurora::NWScript::FunctionContext &ctx);
 	void isAvailableCreature(Aurora::NWScript::FunctionContext &ctx);
 	void addAvailableNPCByTemplate(Aurora::NWScript::FunctionContext &ctx);

diff --git a/src/engines/kotor/script/functions_party.cpp b/src/engines/kotor/script/functions_party.cpp
@@ -50,6 +50,12 @@ void Functions::isObjectPartyMember(Aurora::NWScript::FunctionContext &ctx) {
 	ctx.getReturn() = _game->getModule().isObjectPartyMember(creature);
 }
 
+void Functions::getPartyMemberByIndex(Aurora::NWScript::FunctionContext &ctx) {
+	int index = ctx.getParams()[0].getInt();
+
+	ctx.getReturn() = _game->getModule().getPartyMember(index);
+}
+
 void Functions::showPartySelectionGUI(Aurora::NWScript::FunctionContext &ctx) {
 	const Common::UString &exitScript = ctx.getParams()[0].getString();
 	int forceNPC1 = ctx.getParams()[1].getInt();