mirror of https://github.com/OpenTTD/OpenTTD
Change: Don't handle 'missing' string parameters as 0. (#11673)
If not enough parameters are supplied for a string, then a value of 0 was used, which could result in incorrect information being displayed. Instead, throw an exception and include an error in the string.pull/11685/head
parent
c44faf4eea
commit
7482f71692
1457
src/strings.cpp
1457
src/strings.cpp
File diff suppressed because it is too large
Load Diff
|
@ -95,7 +95,7 @@ public:
|
|||
T GetNextParameter()
|
||||
{
|
||||
auto ptr = GetNextParameterPointer();
|
||||
return static_cast<T>(ptr == nullptr ? 0 : ptr->data);
|
||||
return static_cast<T>(ptr->data);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -107,7 +107,6 @@ public:
|
|||
const char *GetNextParameterString()
|
||||
{
|
||||
auto ptr = GetNextParameterPointer();
|
||||
if (ptr == nullptr) return nullptr;
|
||||
return ptr->string != nullptr ? ptr->string->c_str() : ptr->string_view;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue