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

Add NewGRFClass helper method for whether class ID is valid (for iteration)

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-01-03 03:51:40 +00:00
parent 417416d19b
commit 6a7cad1b47
7 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/object_gui.cpp
View File

@@ -153,7 +153,7 @@ public:
this->object_classes.clear();
for (uint i = 0; i < ObjectClass::GetClassCount(); i++) {
for (uint i = 0; ObjectClass::IsClassIDValid((ObjectClassID)i); i++) {
ObjectClass *objclass = ObjectClass::Get((ObjectClassID)i);
if (objclass->GetUISpecCount() == 0) continue; // Is this needed here?
object_classes.push_back((ObjectClassID)i);
@@ -181,7 +181,7 @@ public:
/* Check if the previously selected object class is not available anymore as a
* result of starting a new game without the corresponding NewGRF. */
bool available = false;
for (uint i = 0; ObjectClass::GetClassCount(); ++i) {
for (uint i = 0; ObjectClass::IsClassIDValid((ObjectClassID)i); ++i) {
if ((ObjectClassID)i == _selected_object_class) {
available = true;
break;