mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-20 14:23:08 +01:00
Code Issues Releases Wiki Activity

Fix #12093. Incorrect position and animation of staff tab. (#12094)

Browse Source 
Mistake made when refactoring transposed two digits. Additional mistake made when removing a variable that was unused that changed the memory layout of the window. This meant that a part of the code that accessed a different variable in a union fetched the wrong memory. This was a mistake ultimately made during implementation.
This commit is contained in:
Duncan
2020-07-02 13:19:19 +01:00
committed by GitHub
parent 920115448e
commit cd716ca4aa
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -41,6 +41,7 @@
- Fix: [#11953] Incorrect banner text shade colour on wall text. - Fix: [#11953] Incorrect banner text shade colour on wall text.
- Fix: [#12062] Inconsistent lift hill sprites on Flying Coaster while inverted (original bug). - Fix: [#12062] Inconsistent lift hill sprites on Flying Coaster while inverted (original bug).
- Fix: [#12068] Incorrect Entrance/Exit location on track design preview. Incorrect track design previews with track that contain diagonal track elements. - Fix: [#12068] Incorrect Entrance/Exit location on track design preview. Incorrect track design previews with track that contain diagonal track elements.
- Fix: [#12093] Staff window tab animation was no longer updating.
- Fix: RCT1 scenarios have more items in the object list than are present in the park or the research list. - Fix: RCT1 scenarios have more items in the object list than are present in the park or the research list.
- Improved: [#6530] Allow water and land height changes on park borders. - Improved: [#6530] Allow water and land height changes on park borders.
- Improved: [#11390] Build hash written to screenshot metadata. - Improved: [#11390] Build hash written to screenshot metadata.

4
src/openrct2-ui/windows/Staff.cpp
View File

@@ -1022,7 +1022,7 @@ void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
return; return;
} }
screenCoords = ScreenCoordsXY{ 20, 14 }; screenCoords = ScreenCoordsXY{ 14, 20 };
Peep* peep = GET_PEEP(w->number); Peep* peep = GET_PEEP(w->number);
@@ -1035,7 +1035,7 @@ void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
if (w->page == WINDOW_STAFF_OVERVIEW) if (w->page == WINDOW_STAFF_OVERVIEW)
{ {
eax = w->highlighted_item >> 16; eax = w->var_496;
eax &= 0xFFFC; eax &= 0xFFFC;
} }
ebx += eax; ebx += eax;

5
src/openrct2/interface/Window_internal.h
View File

@@ -80,10 +80,7 @@ struct rct_window
ResearchItem* research_item; ResearchItem* research_item;
rct_object_entry* object_entry; rct_object_entry* object_entry;
const scenario_index_entry* highlighted_scenario; const scenario_index_entry* highlighted_scenario;
struct uint16_t var_496;
{
uint16_t var_496;
};
}; };
int16_t selected_tab; int16_t selected_tab;
int16_t var_4AE; int16_t var_4AE;