From d0dcd1b134bd005ba54f48d7d4be0ea5cf8ca102 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sat, 27 Jun 2026 23:12:09 +0200 Subject: [PATCH] Codechange: use SLE_INT8 instead of SLE_CHAR --- src/saveload/saveload.h | 4 ---- src/script/script_instance.cpp | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index d1aac9dc58..5e94b70fe0 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -696,9 +696,6 @@ enum VarTypes : uint16_t { SLE_VAR_NAME = 14 << 4, ///< old custom name to be converted to a string pointer /* 1 more possible memory-primitives */ - /* Shortcut values */ - SLE_VAR_CHAR = SLE_VAR_I8, - /* Default combinations of variables. As savegames change, so can variables * and thus it is possible that the saved value and internal size do not * match and you need to specify custom combo. The defaults are listed here */ @@ -711,7 +708,6 @@ enum VarTypes : uint16_t { SLE_UINT32 = SLE_FILE_U32 | SLE_VAR_U32, SLE_INT64 = SLE_FILE_I64 | SLE_VAR_I64, SLE_UINT64 = SLE_FILE_U64 | SLE_VAR_U64, - SLE_CHAR = SLE_FILE_I8 | SLE_VAR_CHAR, SLE_STRINGID = SLE_FILE_STRINGID | SLE_VAR_U32, SLE_STRING = SLE_FILE_STRING | SLE_VAR_STR, SLE_STRINGQUOTE = SLE_FILE_STRING | SLE_VAR_STRQ, diff --git a/src/script/script_instance.cpp b/src/script/script_instance.cpp index faaaa1008d..c8b5d7dd3c 100644 --- a/src/script/script_instance.cpp +++ b/src/script/script_instance.cpp @@ -405,7 +405,7 @@ static const SaveLoad _script_byte[] = { if (!test) { _script_sl_byte = (uint8_t)len; SlObject(nullptr, _script_byte); - SlCopy(const_cast(view.data()), len, SLE_CHAR); + SlCopy(const_cast(view.data()), len, SLE_INT8); } return true; } @@ -612,7 +612,7 @@ bool ScriptInstance::IsPaused() case SQSL_STRING: { SlObject(nullptr, _script_byte); static char buf[std::numeric_limits::max()]; - SlCopy(buf, _script_sl_byte, SLE_CHAR); + SlCopy(buf, _script_sl_byte, SLE_INT8); if (data != nullptr) data->push_back(StrMakeValid(std::string_view(buf, _script_sl_byte))); return true; }