Refactor Guest Window to Class

distribution/changelog.txt

@@ -49,6 +49,7 @@
 - Fix: [#17369] [Plugin] ‘Car.travelBy()’ moves other cars as well.
 - Fix: [#17377] When building the park entrance before opening the Footpaths window, the path will be invisible.
 - Fix: [#17381] Air Powered Vertical Coaster stat penalty is wrong.
+- Fix: [#17399] Guests never generate the being watched thought.
 - Fix: [#17433] Wrong T-shirt colours for guests on a Twist ride.
 - Fix: [#17450] Ducks can swim on three-corners-up land tile.
 - Fix: [#17461] Footpath Railing tooltip showing incorrect tooltip.

src/openrct2-ui/windows/Player.cpp

@@ -146,7 +146,6 @@ rct_window* WindowPlayerOpen(uint8_t id)
         window->frame_no = 0;
         window->list_information_type = 0;
         window->picked_peep_frame = 0;
-        window->highlighted_item = 0;
         window->min_width = 210;
         window->min_height = 134;
         window->max_width = 500;

src/openrct2/interface/Window_internal.h

@@ -71,12 +71,12 @@ struct rct_window
     };
     union
     {
-        int16_t picked_peep_old_x; // staff/guest window: peep x gets set to 0x8000 on pickup, this is the old value
+        int16_t picked_peep_old_x; // staff window: peep x gets set to 0x8000 on pickup, this is the old value
         int16_t vehicleIndex;      // Ride window: selected car when setting vehicle colours
         int16_t var_48C;
     };
     uint16_t frame_no{};              // updated every tic for motion in windows sprites
-    uint16_t list_information_type{}; // 0 for none, Used as current position of marquee in window_peep
+    uint16_t list_information_type{}; // 0 for none
     union
     {
         int16_t picked_peep_frame; // Animation frame of picked peep in staff window and guest window
@@ -84,11 +84,9 @@ struct rct_window
     };
     union
     {
-        uint32_t highlighted_item;
         uint16_t ride_colour;
         ResearchItem* research_item;
         const scenario_index_entry* highlighted_scenario;
-        uint16_t var_496;
     };
     int16_t selected_tab{};
     int16_t var_4AE{};