From 21004e3e63eaa13d0984e47c84281656b5c200be Mon Sep 17 00:00:00 2001 From: NovaRain Date: Thu, 16 Jan 2020 20:35:49 +0800 Subject: [PATCH] Combined tolower/toupper in previous commit to "string_to_case" --- artifacts/scripting/headers/sfall.h | 4 +-- artifacts/scripting/sfall function notes.txt | 10 ++----- sfall/ScriptExtender.cpp | 3 +- sfall/ScriptOps/MetaruleOp.hpp | 3 +- sfall/ScriptOps/ScriptUtils.hpp | 29 ++++++-------------- 5 files changed, 15 insertions(+), 34 deletions(-) diff --git a/artifacts/scripting/headers/sfall.h b/artifacts/scripting/headers/sfall.h index 54304251..1b7350ac 100644 --- a/artifacts/scripting/headers/sfall.h +++ b/artifacts/scripting/headers/sfall.h @@ -279,10 +279,10 @@ #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_format(format, a1, a2) sfall_func3("string_format", format, a1, a2) +#define string_tolower(text) sfall_func2("string_to_case", text, 0) +#define string_toupper(text) sfall_func2("string_to_case", text, 1) #define tile_by_position(x, y) sfall_func2("tile_by_position", x, y) #define tile_refresh_display sfall_func0("tile_refresh_display") -#define tolower(text) sfall_func1("tolower", text) -#define toupper(text) sfall_func1("toupper", text) #define unjam_lock(obj) sfall_func1("unjam_lock", obj) #define unset_unique_id(obj) sfall_func2("set_unique_id", obj, -1) #define unwield_slot(critter, slot) sfall_func2("unwield_slot", critter, slot) diff --git a/artifacts/scripting/sfall function notes.txt b/artifacts/scripting/sfall function notes.txt index 4ce1b8ee..55628cb4 100644 --- a/artifacts/scripting/sfall function notes.txt +++ b/artifacts/scripting/sfall function notes.txt @@ -603,13 +603,9 @@ optional arguments: - returns the tile number at the x, y position relative to the top-left corner of the screen - if the position is outside of the range of tiles, it will return -1 -> string sfall_func1("tolower", string text) -- converts all uppercase letters in the given string to lowercase -- returns -1 on argument error - -> string sfall_func1("toupper", string text) -- converts all lowercase letters in the given string to uppercase -- returns -1 on argument error +> string sfall_func2("string_to_case", string text, int toCase) +- converts all letters in the given string to the specified case +- toCase: 0 - lowercase, 1 - uppercase ------------------------ ------ MORE INFO ------- diff --git a/sfall/ScriptExtender.cpp b/sfall/ScriptExtender.cpp index 941d3802..4b5f3bc5 100644 --- a/sfall/ScriptExtender.cpp +++ b/sfall/ScriptExtender.cpp @@ -431,9 +431,8 @@ static const SfallOpcodeMetadata opcodeMetaArray[] = { {sf_set_unjam_locks_time, "set_unjam_locks_time", {DATATYPE_MASK_INT}}, {sf_set_window_flag, "set_window_flag", {DATATYPE_MASK_INT | DATATYPE_MASK_STR, DATATYPE_MASK_INT, DATATYPE_MASK_INT}}, {sf_show_window, "show_window", {DATATYPE_MASK_STR}}, + {sf_string_to_case, "string_to_case", {DATATYPE_MASK_STR, DATATYPE_MASK_INT}}, {sf_tile_by_position, "tile_by_position", {DATATYPE_MASK_INT, DATATYPE_MASK_INT}}, - {sf_tolower, "tolower", {DATATYPE_MASK_STR}}, - {sf_toupper, "toupper", {DATATYPE_MASK_STR}}, {sf_unjam_lock, "unjam_lock", {DATATYPE_MASK_VALID_OBJ}}, {sf_unwield_slot, "unwield_slot", {DATATYPE_MASK_VALID_OBJ, DATATYPE_MASK_INT}}, #ifndef NDEBUG diff --git a/sfall/ScriptOps/MetaruleOp.hpp b/sfall/ScriptOps/MetaruleOp.hpp index caf2a786..77f26121 100644 --- a/sfall/ScriptOps/MetaruleOp.hpp +++ b/sfall/ScriptOps/MetaruleOp.hpp @@ -171,10 +171,9 @@ static const SfallMetarule metaruleArray[] = { {"spatial_radius", sf_spatial_radius, 1, 1}, {"string_compare", sf_string_compare, 2, 3}, {"string_format", sf_string_format, 2, 5}, + {"string_to_case", sf_string_to_case, 2, 2}, {"tile_by_position", sf_tile_by_position, 2, 2}, {"tile_refresh_display", sf_tile_refresh_display, 0, 0}, - {"tolower", sf_tolower, 1, 1}, - {"toupper", sf_toupper, 1, 1}, {"unjam_lock", sf_unjam_lock, 1, 1}, {"unwield_slot", sf_unwield_slot, 2, 2}, #ifndef NDEBUG diff --git a/sfall/ScriptOps/ScriptUtils.hpp b/sfall/ScriptOps/ScriptUtils.hpp index ff9c6b9f..5a184c48 100644 --- a/sfall/ScriptOps/ScriptUtils.hpp +++ b/sfall/ScriptOps/ScriptUtils.hpp @@ -999,27 +999,14 @@ static void sf_get_text_width() { } } -static char* _stdcall cstrdup(const char* str) { - size_t len = strlen(str); - const size_t bufMaxLen = GlblTextBufferSize() - 1; - if (len > bufMaxLen) len = bufMaxLen; +static std::string strToCase; - if (len) memcpy(gTextBuffer, str, len); - gTextBuffer[len] = '\0'; +static void sf_string_to_case() { + strToCase = opHandler.arg(0).strValue(); + if (opHandler.arg(1).rawValue()) + std::transform(strToCase.begin(), strToCase.end(), strToCase.begin(), ::toupper); + else + std::transform(strToCase.begin(), strToCase.end(), strToCase.begin(), ::tolower); - return gTextBuffer; -} - -static void sf_tolower() { - std::string str = std::string(opHandler.arg(0).strValue()); - std::transform(str.begin(), str.end(), str.begin(), ::tolower); - - opHandler.setReturn(cstrdup(str.c_str())); -} - -static void sf_toupper() { - std::string str = std::string(opHandler.arg(0).strValue()); - std::transform(str.begin(), str.end(), str.begin(), ::toupper); - - opHandler.setReturn(cstrdup(str.c_str())); + opHandler.setReturn(strToCase.c_str()); }