Added IndexOf() and LastIndexOf() functions to ZScript string type

https://forum.zdoom.org/viewtopic.php?t=57313
ZDoom · Jul 22, 2017 · c56cd24 · c56cd24
1 parent ebd20da
commit c56cd24
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/scripting/thingdef_data.cpp b/src/scripting/thingdef_data.cpp
@@ -1252,3 +1252,18 @@ DEFINE_ACTION_FUNCTION(FStringStruct, Filter)
 	ACTION_RETURN_STRING(strbin1(*self));
 }
 
+DEFINE_ACTION_FUNCTION(FStringStruct, IndexOf)
+{
+	PARAM_SELF_STRUCT_PROLOGUE(FString);
+	PARAM_STRING(substr);
+	PARAM_INT_DEF(startIndex);
+	ACTION_RETURN_INT(self->IndexOf(substr, startIndex));
+}
+
+DEFINE_ACTION_FUNCTION(FStringStruct, LastIndexOf)
+{
+	PARAM_SELF_STRUCT_PROLOGUE(FString);
+	PARAM_STRING(substr);
+	ACTION_RETURN_INT(self->LastIndexOf(substr));
+}
+
diff --git a/wadsrc/static/zscript/base.txt b/wadsrc/static/zscript/base.txt
@@ -656,6 +656,8 @@ struct StringStruct native
 	native String CharAt(int pos) const;
 	native int CharCodeAt(int pos) const;
 	native String Filter();
+	native int IndexOf(String substr, int startIndex = 0) const;
+	native int LastIndexOf(String substr) const;
 }
 
 class SectorEffect : Thinker native