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

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
Peter Nelson 2024-01-04 20:50:58 +00:00 committed by GitHub
parent c44faf4eea
commit 7482f71692
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 731 additions and 729 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1457
src/strings.cpp
View File

File diff suppressed because it is too large Load Diff

3
src/strings_internal.h
View File

@ -95,7 +95,7 @@ public:
T GetNextParameter() T GetNextParameter()
{ {
auto ptr = GetNextParameterPointer(); 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() const char *GetNextParameterString()
{ {
auto ptr = GetNextParameterPointer(); auto ptr = GetNextParameterPointer();
if (ptr == nullptr) return nullptr;
return ptr->string != nullptr ? ptr->string->c_str() : ptr->string_view; return ptr->string != nullptr ? ptr->string->c_str() : ptr->string_view;
} }