diff options
author | Patric Stout <truebrain@openttd.org> | 2021-05-29 11:21:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-29 11:21:38 +0200 |
commit | ca9a7df7522a614b839a83e1ba9b6a7b08642b8a (patch) | |
tree | 172dedad1d930ef7699838272e779c9d7218319b /src/script/api | |
parent | 4d74e519074bec9a07c2997715ab635ac0e8f084 (diff) | |
download | openttd-ca9a7df7522a614b839a83e1ba9b6a7b08642b8a.tar.xz |
Codechange: rename str_validate to StrMakeValid(InPlace) (#9304)
This to be more explicit the function changes the value, and not
returns yes/no.
Diffstat (limited to 'src/script/api')
-rw-r--r-- | src/script/api/script_object.cpp | 4 | ||||
-rw-r--r-- | src/script/api/script_text.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/script/api/script_object.cpp b/src/script/api/script_object.cpp index 85a85cca1..1f72eaa22 100644 --- a/src/script/api/script_object.cpp +++ b/src/script/api/script_object.cpp @@ -283,7 +283,7 @@ ScriptObject::ActiveInstance::~ActiveInstance() { char buffer[64]; ::GetString(buffer, string, lastof(buffer)); - ::str_validate(buffer, lastof(buffer), SVS_NONE); + ::StrMakeValidInPlace(buffer, lastof(buffer), SVS_NONE); return ::stredup(buffer); } @@ -312,7 +312,7 @@ ScriptObject::ActiveInstance::~ActiveInstance() if (!StrEmpty(text) && (GetCommandFlags(cmd) & CMD_STR_CTRL) == 0) { /* The string must be valid, i.e. not contain special codes. Since some * can be made with GSText, make sure the control codes are removed. */ - ::str_validate(const_cast<char *>(text), text + strlen(text), SVS_NONE); + ::StrMakeValidInPlace(text, SVS_NONE); } /* Set the default callback to return a true/false result of the DoCommand */ diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp index 36f941793..dd32d0d42 100644 --- a/src/script/api/script_text.cpp +++ b/src/script/api/script_text.cpp @@ -82,7 +82,7 @@ SQInteger ScriptText::_SetParam(int parameter, HSQUIRRELVM vm) sq_getstring(vm, -1, &value); this->params[parameter] = stredup(value); - ValidateString(this->params[parameter]); + StrMakeValidInPlace(this->params[parameter]); break; } @@ -157,7 +157,7 @@ SQInteger ScriptText::_set(HSQUIRRELVM vm) if (sq_gettype(vm, 2) == OT_STRING) { const SQChar *key_string; sq_getstring(vm, 2, &key_string); - ValidateString(key_string); + StrMakeValidInPlace(key_string); if (strncmp(key_string, "param_", 6) != 0 || strlen(key_string) > 8) return SQ_ERROR; k = atoi(key_string + 6); |