fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Renamed "string_pos" function to "string_find"

Browse Source
This commit is contained in:
NovaRain
2023-08-09 08:57:03 +08:00
parent 2677d9faa7
commit 8fd5182bb5
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/scripting/headers/lib.strings.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include "sfall.h"
#define is_in_string(str, sub) (string_pos(str, sub) != -1)
#define string_contains(str, sub) (string_find(str, sub) != -1)
#define string_starts_with(str, sub) (substr(str, 0, strlen(sub)) == sub)
#define string_format_array(fmt, arr) sprintf_array(fmt, arr)
// Replaces all occurances of substring in a string with another substring
artifacts/scripting/headers/sfall.h
+2 -2
View File
@@ -390,8 +390,8 @@
#define spatial_radius(obj) sfall_func1("spatial_radius", obj)
#define string_compare(str1, str2) sfall_func2("string_compare", str1, str2)
#define string_compare_locale(str1, str2, codePage) sfall_func3("string_compare", str1, str2, codePage)
#define string_pos(haystack, needle) sfall_func2("string_pos", haystack, needle)
#define string_pos_from(haystack, needle, pos) sfall_func3("string_pos", haystack, needle, pos)
#define string_find(haystack, needle) sfall_func2("string_find", haystack, needle)
#define string_find_from(haystack, needle, pos) sfall_func3("string_find", haystack, needle, pos)
#define string_format1(format, a1) sfall_func2("string_format", format, a1)
#define string_format2(format, a1, a2) sfall_func3("string_format", format, a1, a2)
#define string_format3(format, a1, a2, a3) sfall_func4("string_format", format, a1, a2, a3)
artifacts/scripting/sfall function notes.md
+3 -3
View File
@@ -1101,9 +1101,9 @@ sfall_funcX metarule functions
- Subsequent calls for the same file will return the same array, unless it was disposed using `free_array`
----
#### string_pos
`int sfall_func2("string_pos", string haystack, string needle)`
`int sfall_func3("string_pos", string haystack, string needle, int pos)`
#### string_find
`int sfall_func2("string_find", string haystack, string needle)`
`int sfall_func3("string_find", string haystack, string needle, int pos)`
- Returns the position of the first occurrence of a `needle` string in a `haystack` string, or -1 if not found. The first character position is 0 (zero)
sfall/Modules/Scripting/Handlers/Metarule.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ static const SfallMetarule metarules[] = {
{"show_window", mf_show_window, 0, 1, -1, {ARG_STRING}},
{"spatial_radius", mf_spatial_radius, 1, 1, 0, {ARG_OBJECT}},
{"string_compare", mf_string_compare, 2, 3, 0, {ARG_STRING, ARG_STRING, ARG_INT}},
{"string_pos", mf_string_pos, 2, 3, -1, {ARG_STRING, ARG_STRING, ARG_INT}},
{"string_find", mf_string_find, 2, 3, -1, {ARG_STRING, ARG_STRING, ARG_INT}},
{"string_format", mf_string_format, 2, 8, 0, {ARG_STRING, ARG_ANY, ARG_ANY, ARG_ANY, ARG_ANY, ARG_ANY, ARG_ANY, ARG_ANY}},
{"string_to_case", mf_string_to_case, 2, 2, -1, {ARG_STRING, ARG_INT}},
{"tile_by_position", mf_tile_by_position, 2, 2, -1, {ARG_INT, ARG_INT}},
sfall/Modules/Scripting/Handlers/Utils.cpp
+1 -1
View File
@@ -198,7 +198,7 @@ void mf_string_compare(OpcodeContext& ctx) {
}
}
void mf_string_pos(OpcodeContext& ctx) {
void mf_string_find(OpcodeContext& ctx) {
const char* const haystack = ctx.arg(0).strValue();
int pos = 0;
if (ctx.numArgs() > 2) {
sfall/Modules/Scripting/Handlers/Utils.h
+1 -1
View File
@@ -37,7 +37,7 @@ void op_strlen(OpcodeContext&);
void mf_string_compare(OpcodeContext&);
void mf_string_pos(OpcodeContext&);
void mf_string_find(OpcodeContext&);
void op_sprintf(OpcodeContext&);