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

Change: Expose ObjectSpec vector to simplify iteration.

Browse Source 
(cherry picked from commit 51b112139235c66c3adb2c3a75919fc1d3eff9fc)
This commit is contained in:
Peter Nelson
2023-01-15 00:04:53 +00:00
committed by Jonathan G Rennison
parent 74e4556a85
commit c95a3be243
5 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/object_gui.cpp
View File

@@ -273,11 +273,10 @@ public:
uint height[2] = {0, 0}; // The height for the different views; in this case views 1/2 and 4.
/* Get the height and view information. */
for (int i = 0; i < ObjectSpec::Count(); i++) {
const ObjectSpec *spec = ObjectSpec::Get(i);
if (!spec->IsEverAvailable()) continue;
two_wide |= spec->views >= 2;
height[spec->views / 4] = std::max<int>(spec->height, height[spec->views / 4]);
for (const auto &spec : ObjectSpec::Specs()) {
if (!spec.IsEverAvailable()) continue;
two_wide |= spec.views >= 2;
height[spec.views / 4] = std::max<int>(spec.height, height[spec.views / 4]);
}
/* Determine the pixel heights. */