KOTOR: Implement NWScript function JumpToLocation

This makes the first "real" area of KotOR2 more playable: the player is moved out of the kolto tank during the opening cutscene.
xoreos · Mar 1, 2019 · c68c3e7 · c68c3e7
1 parent 9093585
commit c68c3e7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/engines/kotor/script/function_tables.h b/src/engines/kotor/script/function_tables.h
@@ -431,7 +431,7 @@ const Functions::FunctionPointer Functions::kFunctionPointers[] = {
 	{ 310, "ActionUseTalentAtLocation"           , 0                                                },
 	{ 311, "GetGoldPieceValue"                   , 0                                                },
 	{ 312, "GetIsPlayableRacialType"             , 0                                                },
-	{ 313, "JumpToLocation"                      , 0                                                },
+	{ 313, "JumpToLocation"                      , &Functions::jumpToLocation                       },
 	{ 314, "EffectTemporaryHitpoints"            , 0                                                },
 	{ 315, "GetSkillRank"                        , &Functions::getSkillRank                         },
 	{ 316, "GetAttackTarget"                     , 0                                                },

diff --git a/src/engines/kotor2/script/function_tables.h b/src/engines/kotor2/script/function_tables.h
@@ -432,7 +432,7 @@ const Functions::FunctionPointer Functions::kFunctionPointers[] = {
 	{ 310, "ActionUseTalentAtLocation"           , 0                                                },
 	{ 311, "GetGoldPieceValue"                   , 0                                                },
 	{ 312, "GetIsPlayableRacialType"             , 0                                                },
-	{ 313, "JumpToLocation"                      , 0                                                },
+	{ 313, "JumpToLocation"                      , &Functions::jumpToLocation                       },
 	{ 314, "EffectTemporaryHitpoints"            , 0                                                },
 	{ 315, "GetSkillRank"                        , &Functions::getSkillRank                         },
 	{ 316, "GetAttackTarget"                     , 0                                                },

diff --git a/src/engines/kotorbase/script/functions.h b/src/engines/kotorbase/script/functions.h
@@ -189,6 +189,8 @@ class Functions {
 	void getArea    (Aurora::NWScript::FunctionContext &ctx);
 	void getLocation(Aurora::NWScript::FunctionContext &ctx);
 
+	void jumpToLocation(Aurora::NWScript::FunctionContext &ctx);
+
 	void setMinOneHP(Aurora::NWScript::FunctionContext &ctx);
 	void setMaxHitPoints(Aurora::NWScript::FunctionContext &ctx);
 

diff --git a/src/engines/kotorbase/script/functions_object.cpp b/src/engines/kotorbase/script/functions_object.cpp
@@ -167,6 +167,18 @@ void Functions::getLocation(Aurora::NWScript::FunctionContext &ctx) {
 	ctx.getReturn() = object->getLocation();
 }
 
+void Functions::jumpToLocation(Aurora::NWScript::FunctionContext &ctx) {
+	Object *object = ObjectContainer::toObject(ctx.getCaller());
+	Location *moveTo = ObjectContainer::toLocation(ctx.getParams()[0].getEngineType());
+
+	if (!object || !moveTo)
+		return;
+
+	float x, y, z;
+	moveTo->getPosition(x, y, z);
+	object->setPosition(x, y, z);
+}
+
 void Functions::getItemInSlot(Aurora::NWScript::FunctionContext &ctx) {
 	Creature *creature = 0;