Fix #3113: Crash on open company window with focus near the map edge (#3119)

ZehMatt · web-flow · commit fc8eac2e2963 · 2025-06-17T01:22:02.000+03:00
* Fix #3113: Crash on open company window with focus near the map edge * Update CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 25.05+ (???)
 ------------------------------------------------------------------------
 - Fix: [#2817] Deleting a vehicle that is followed on the main viewport crashes the game.
+- Fix: [#3113] Crash when having an on open company window with the viewport being near the map edge.
 - Fix: [#3114] Details in the Object Selection window not drawing depending on the window position.
 
 25.05 (2025-05-28)
diff --git a/src/OpenLoco/src/Ui/Window.h b/src/OpenLoco/src/Ui/Window.h
@@ -110,71 +110,58 @@ namespace OpenLoco::Ui
 
     struct SavedView
     {
-        union
-        {
-            coord_t mapX;
-            EntityId entityId;
-        };
-        union
-        {
-            coord_t mapY;
-            uint16_t flags;
-        };
-        ZoomLevel zoomLevel;
-        int8_t rotation;
-        int16_t surfaceZ;
+        coord_t mapX{ -1 };
+        coord_t mapY{ -1 };
+        EntityId entityId{ EntityId::null };
+        uint16_t flags{};
+        ZoomLevel zoomLevel{};
+        int8_t rotation{};
+        int16_t surfaceZ{};
 
-        SavedView() = default;
+        constexpr SavedView() = default;
 
-        SavedView(coord_t mapX, coord_t mapY, ZoomLevel zoomLevel, int8_t rotation, coord_t surfaceZ)
+        constexpr SavedView(coord_t mapX, coord_t mapY, ZoomLevel zoomLevel, int8_t rotation, coord_t surfaceZ)
             : mapX(mapX)
             , mapY(mapY)
             , zoomLevel(zoomLevel)
             , rotation(rotation)
             , surfaceZ(surfaceZ) {};
 
-        SavedView(EntityId entityId, uint16_t flags, ZoomLevel zoomLevel, int8_t rotation, coord_t surfaceZ)
+        constexpr SavedView(EntityId entityId, uint16_t flags, ZoomLevel zoomLevel, int8_t rotation, coord_t surfaceZ)
             : entityId(entityId)
             , flags(flags)
             , zoomLevel(zoomLevel)
             , rotation(rotation)
             , surfaceZ(surfaceZ) {};
 
-        bool isEmpty() const
-        {
-            return mapX == -1 && mapY == -1;
-        }
-
-        bool hasUnkFlag15() const
+        constexpr bool isEmpty() const
         {
-            return (flags & (1 << 14)) != 0;
+            return mapX == -1 && mapY == -1 && entityId == EntityId::null;
         }
 
-        bool isEntityView() const
+        constexpr bool isEntityView() const
         {
             return (flags & (1 << 15)) != 0;
         }
 
-        World::Pos3 getPos() const
+        constexpr World::Pos3 getPos() const
         {
             if (isEntityView())
             {
                 return {};
             }
 
-            return { mapX, static_cast<coord_t>(mapY & 0x3FFF), surfaceZ };
+            return { mapX, mapY, surfaceZ };
         }
 
-        void clear()
+        constexpr void clear()
         {
             mapX = -1;
             mapY = -1;
+            entityId = EntityId::null;
         }
 
-        bool operator==(const SavedView& rhs) const
-        {
-            return mapX == rhs.mapX && mapY == rhs.mapY && zoomLevel == rhs.zoomLevel && rotation == rhs.rotation && surfaceZ == rhs.surfaceZ;
-        }
+        auto operator<=>(const SavedView& other) const = default;
     };
 
     struct Window
