mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: generify GetRemainingParameters to allow custom offsets

pull/11031/head
Rubidium 2023-06-17 23:17:04 +02:00 committed by rubidium42
parent 9215e36300
commit e404ba0631
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/strings.cpp
View File

@ -1036,7 +1036,7 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
_scan_for_gender_data = true; _scan_for_gender_data = true;
std::string buffer; std::string buffer;
StringBuilder tmp_builder(buffer); StringBuilder tmp_builder(buffer);
StringParameters tmp_params(args.GetPointerToOffset(offset), args.num_param - offset, nullptr); StringParameters tmp_params = args.GetRemainingParameters(offset);
FormatString(tmp_builder, input, tmp_params); FormatString(tmp_builder, input, tmp_params);
_scan_for_gender_data = old_sgd; _scan_for_gender_data = old_sgd;

20
src/strings_internal.h
View File

@ -81,16 +81,28 @@ public:
/** /**
* Get a new instance of StringParameters that is a "range" into the * Get a new instance of StringParameters that is a "range" into the
* parameters existing parameters. Upon destruction the offset in the parent * remaining existing parameters. Upon destruction the offset in the parent
* is not updated. However, calls to SetDParam do update the parameters. * is not updated. However, calls to SetDParam do update the parameters.
* *
* The returned StringParameters must not outlive this StringParameters. * The returned StringParameters must not outlive this StringParameters.
* @return A "range" of the string parameters. * @return A "range" of the string parameters.
*/ */
StringParameters GetRemainingParameters() StringParameters GetRemainingParameters() { return GetRemainingParameters(this->offset); }
/**
* Get a new instance of StringParameters that is a "range" into the
* remaining existing parameters from the given offset. Upon destruction the
* offset in the parent is not updated. However, calls to SetDParam do
* update the parameters.
*
* The returned StringParameters must not outlive this StringParameters.
* @param offset The offset to get the remaining parameters for.
* @return A "range" of the string parameters.
*/
StringParameters GetRemainingParameters(size_t offset)
{ {
return StringParameters(&this->data[this->offset], GetDataLeft(), return StringParameters(&this->data[offset], GetDataLeft(),
this->type == nullptr ? nullptr : &this->type[this->offset]); this->type == nullptr ? nullptr : &this->type[offset]);
} }
/** Return the amount of elements which can still be read. */ /** Return the amount of elements which can still be read. */