dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use StringBuilder for GetString/GetStringWithArgs, as per upstream

Browse Source 
Update dependent code as required
This commit is contained in:
Jonathan G Rennison
2024-01-05 21:12:54 +00:00
parent 1b7a5372ec
commit f034714559
61 changed files with 1064 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/newgrf_townname.cpp
View File

@@ -16,6 +16,7 @@
#include "newgrf_townname.h"
#include "core/alloc_func.hpp"
#include "string_func.h"
#include "strings_internal.h"
#include "table/strings.h"
@@ -24,14 +25,14 @@
static std::vector<GRFTownName> _grf_townnames;
static std::vector<StringID> _grf_townname_names;
GRFTownName *GetGRFTownName(uint32 grfid)
GRFTownName *GetGRFTownName(uint32_t grfid)
{
auto found = std::find_if(std::begin(_grf_townnames), std::end(_grf_townnames), [&grfid](const GRFTownName &t){ return t.grfid == grfid; });
if (found != std::end(_grf_townnames)) return &*found;
return nullptr;
}
GRFTownName *AddGRFTownName(uint32 grfid)
GRFTownName *AddGRFTownName(uint32_t grfid)
{
GRFTownName *t = GetGRFTownName(grfid);
if (t == nullptr) {
@@ -41,41 +42,38 @@ GRFTownName *AddGRFTownName(uint32 grfid)
return t;
}
void DelGRFTownName(uint32 grfid)
void DelGRFTownName(uint32_t grfid)
{
_grf_townnames.erase(std::find_if(std::begin(_grf_townnames), std::end(_grf_townnames), [&grfid](const GRFTownName &t){ return t.grfid == grfid; }));
}
static char *RandomPart(char *buf, const GRFTownName *t, uint32 seed, byte id, const char *last)
static void RandomPart(StringBuilder builder, const GRFTownName *t, uint32_t seed, byte id)
{
assert(t != nullptr);
for (const auto &partlist : t->partlists[id]) {
byte count = partlist.bitcount;
uint16 maxprob = partlist.maxprob;
uint32 r = (GB(seed, partlist.bitstart, count) * maxprob) >> count;
uint16_t maxprob = partlist.maxprob;
uint32_t r = (GB(seed, partlist.bitstart, count) * maxprob) >> count;
for (const auto &part : partlist.parts) {
maxprob -= GB(part.prob, 0, 7);
if (maxprob > r) continue;
if (HasBit(part.prob, 7)) {
buf = RandomPart(buf, t, seed, part.id, last);
RandomPart(builder, t, seed, part.id);
} else {
buf = strecat(buf, part.text.c_str(), last);
builder += part.text;
}
break;
}
}
return buf;
}
char *GRFTownNameGenerate(char *buf, uint32 grfid, uint16 gen, uint32 seed, const char *last)
void GRFTownNameGenerate(StringBuilder builder, uint32_t grfid, uint16_t gen, uint32_t seed)
{
strecpy(buf, "", last);
const GRFTownName *t = GetGRFTownName(grfid);
if (t != nullptr) {
assert(gen < t->styles.size());
buf = RandomPart(buf, t, seed, t->styles[gen].id, last);
RandomPart(builder, t, seed, t->styles[gen].id);
}
return buf;
}
@@ -95,7 +93,7 @@ const std::vector<StringID> &GetGRFTownNameList()
return _grf_townname_names;
}
StringID GetGRFTownNameName(uint16 gen)
StringID GetGRFTownNameName(uint16_t gen)
{
return gen < _grf_townname_names.size() ? _grf_townname_names[gen] : STR_UNDEFINED;
}
@@ -105,21 +103,21 @@ void CleanUpGRFTownNames()
_grf_townnames.clear();
}
uint32 GetGRFTownNameId(uint16 gen)
uint32_t GetGRFTownNameId(uint16_t gen)
{
for (const auto &t : _grf_townnames) {
if (gen < t.styles.size()) return t.grfid;
gen -= static_cast<uint16>(t.styles.size());
gen -= static_cast<uint16_t>(t.styles.size());
}
/* Fallback to no NewGRF */
return 0;
}
uint16 GetGRFTownNameType(uint16 gen)
uint16_t GetGRFTownNameType(uint16_t gen)
{
for (const auto &t : _grf_townnames) {
if (gen < t.styles.size()) return gen;
gen -= static_cast<uint16>(t.styles.size());
gen -= static_cast<uint16_t>(t.styles.size());
}
/* Fallback to english original */
return SPECSTR_TOWNNAME_ENGLISH;