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

Combined tolower/toupper in previous commit to "string_to_case"

Browse Source
This commit is contained in:
NovaRain
2020-01-16 20:35:49 +08:00
parent d12db2be28
commit 21004e3e63
5 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/scripting/headers/sfall.h
+2 -2
View File
@@ -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)
artifacts/scripting/sfall function notes.txt
+3 -7
View File
@@ -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 -------
sfall/ScriptExtender.cpp
+1 -2
View File
@@ -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
sfall/ScriptOps/MetaruleOp.hpp
+1 -2
View File
@@ -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
sfall/ScriptOps/ScriptUtils.hpp
+8 -21
View File
@@ -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());
}