Merge pull request scp-fs2open#6386 from MjnMixael/fix_skip_to_string

Return false if skip to string can't find the string
Goober5000 · Oct 20, 2024 · 91a2291 · 91a2291
2 parents 83d1268 + a1a5780
commit 91a2291
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/code/scripting/api/libs/parse.cpp b/code/scripting/api/libs/parse.cpp
@@ -95,13 +95,17 @@ ADE_FUNC(skipToString, l_Parsing, "string token", "Search for specified string,
 	}
 
 	try {
-		skip_to_string(str);
+		int found = skip_to_string(str);
+
+		if (found == 1) {
+			return ADE_RETURN_TRUE;
+		} else {
+			return ADE_RETURN_FALSE;
+		}
 	} catch (const parse::ParseException& e) {
 		mprintf(("PARSE: Error while parsing: %s\n", e.what()));
 		return ADE_RETURN_FALSE;
 	}
-
-	return ADE_RETURN_TRUE;
 }
 
 ADE_FUNC(requiredString, l_Parsing, "string token", "Require that a string appears at the current position.", "boolean",