From c45bd3020dbe8173e00abbf46f861679472edda3 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 20 Feb 2023 17:09:19 +0000 Subject: [PATCH] strgen: Fix type conversion warnings --- src/strgen/strgen.h | 2 +- src/strgen/strgen_base.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/strgen/strgen.h b/src/strgen/strgen.h index 06e81afa5a..4c7a58e8d0 100644 --- a/src/strgen/strgen.h +++ b/src/strgen/strgen.h @@ -39,7 +39,7 @@ struct LangString { std::unique_ptr chain_after; LangString *default_translation = nullptr; - LangString(const char *name, const char *english, size_t index, int line); + LangString(const char *name, const char *english, int index, int line); void ReplaceDefinition(const char *name, const char *english, int line); ~LangString(); void FreeTranslation(); diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp index 32d5b37ea3..ee27105da4 100644 --- a/src/strgen/strgen_base.cpp +++ b/src/strgen/strgen_base.cpp @@ -56,7 +56,7 @@ Case::~Case() * @param index The index in the string table. * @param line The line this string was found on. */ -LangString::LangString(const char *name, const char *english, size_t index, int line) : +LangString::LangString(const char *name, const char *english, int index, int line) : name(stredup(name)), english(stredup(english)), translated(nullptr), hash_next(0), index(index), line(line), translated_case(nullptr) { @@ -891,7 +891,7 @@ void StringReader::AssignIDs(size_t &next_id, LangString *ls) if (ls->index >= 0) { next_id = ls->index; } else { - ls->index = next_id; + ls->index = (int)next_id; } if ((size_t)ls->index >= this->data.max_strings) {