Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return false if skip to string can't find the string #6386

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions code/scripting/api/libs/parse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading