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

Codechange: Store objectspecs in std::vector instead of flat array.

Browse Source 
(cherry picked from commit 1ae263c5467105820e4d770b3d57d25ba01e22b1)
This commit is contained in:
Peter Nelson
2022-11-06 19:21:03 +00:00
committed by Jonathan G Rennison
parent d34e1bbbc1
commit 74e4556a85
8 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/object_gui.cpp
View File

@@ -273,11 +273,11 @@ 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 < NUM_OBJECTS; i++) {
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>(ObjectSpec::Get(i)->height, height[spec->views / 4]);
height[spec->views / 4] = std::max<int>(spec->height, height[spec->views / 4]);
}
/* Determine the pixel heights. */