mirror of https://github.com/OpenTTD/OpenTTD
Codefix: GameScript string numbers are not StringIDs.
parent
8dfab2a607
commit
a7c701bb41
|
@ -132,13 +132,13 @@ private:
|
||||||
using Param = std::variant<SQInteger, std::string, ScriptTextRef>;
|
using Param = std::variant<SQInteger, std::string, ScriptTextRef>;
|
||||||
|
|
||||||
struct ParamCheck {
|
struct ParamCheck {
|
||||||
StringID owner;
|
uint owner;
|
||||||
int idx;
|
int idx;
|
||||||
Param *param;
|
Param *param;
|
||||||
bool used = false;
|
bool used = false;
|
||||||
const char *cmd = nullptr;
|
const char *cmd = nullptr;
|
||||||
|
|
||||||
ParamCheck(StringID owner, int idx, Param *param) : owner(owner), idx(idx), param(param) {}
|
ParamCheck(uint owner, int idx, Param *param) : owner(owner), idx(idx), param(param) {}
|
||||||
|
|
||||||
void Encode(std::back_insert_iterator<std::string> &output, const char *cmd);
|
void Encode(std::back_insert_iterator<std::string> &output, const char *cmd);
|
||||||
};
|
};
|
||||||
|
@ -146,7 +146,7 @@ private:
|
||||||
using ParamList = std::vector<ParamCheck>;
|
using ParamList = std::vector<ParamCheck>;
|
||||||
using ParamSpan = std::span<ParamCheck>;
|
using ParamSpan = std::span<ParamCheck>;
|
||||||
|
|
||||||
StringID string;
|
uint string;
|
||||||
std::array<Param, SCRIPT_TEXT_MAX_PARAMETERS> param = {};
|
std::array<Param, SCRIPT_TEXT_MAX_PARAMETERS> param = {};
|
||||||
int paramc = 0;
|
int paramc = 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue