miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: introduce ReferenceThroughBaseContainer

Browse Source 
This provides support for ConvertibleThroughBase positions passed to the
functions of a container that return a reference, specifically 'at(pos)'
and 'operator[](pos)'.
This commit is contained in:
Rubidium
2025-02-08 12:51:58 +01:00
committed by rubidium42
parent 44a979559a
commit 2929411130
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/game_text.cpp
View File

@@ -318,7 +318,7 @@ GameStrings *_current_data = nullptr;
const char *GetGameStringPtr(StringIndexInTab id)
{
if (_current_data == nullptr || _current_data->cur_language == nullptr || id.base() >= _current_data->cur_language->lines.size()) return GetStringPtr(STR_UNDEFINED);
return _current_data->cur_language->lines[id.base()].c_str();
return _current_data->cur_language->lines[id].c_str();
}
/**
@@ -332,7 +332,7 @@ const StringParams &GetGameStringParams(StringIndexInTab id)
static StringParams empty;
if (id.base() >= _current_data->string_params.size()) return empty;
return _current_data->string_params[id.base()];
return _current_data->string_params[id];
}
/**
@@ -346,7 +346,7 @@ const std::string &GetGameStringName(StringIndexInTab id)
static const std::string undefined = "STR_UNDEFINED";
if (id.base() >= _current_data->string_names.size()) return undefined;
return _current_data->string_names[id.base()];
return _current_data->string_names[id];
}
/**