KOTOR2: Fix FindSubString for "not found"

Assigning to ctx.Return() doesn't actually return from the function.
xoreos · Nov 4, 2016 · c2228bd · c2228bd
1 parent 46d6f19
commit c2228bd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/engines/kotor2/script/functions_string.cpp b/src/engines/kotor2/script/functions_string.cpp
@@ -200,9 +200,11 @@ void Functions::findSubString(Aurora::NWScript::FunctionContext &ctx) {
 	const Common::UString &str = ctx.getParams()[0].getString();
 	const Common::UString &sub = ctx.getParams()[1].getString();
 
+	ctx.getReturn() = -1;
+
 	Common::UString::iterator it = str.findFirst(sub);
 	if (it == str.end())
-		ctx.getReturn() = -1;
+		return;
 
 	ctx.getReturn() = (int32) str.getPosition(it);
 }