fix: go to house without exit

opentibiabr · Aug 9, 2024 · 9554e77 · 9554e77
1 parent 639c26a
commit 9554e77
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/source/house.h b/source/house.h
@@ -53,6 +53,10 @@ class House {
 	uint8_t getEmptyDoorID() const;
 	Position getDoorPositionByID(uint8_t id) const;
 
+	const PositionList &getTiles() const {
+		return tiles;
+	}
+
 protected:
 	Map* map;
 	PositionList tiles;

diff --git a/source/palette_house.cpp b/source/palette_house.cpp
@@ -322,10 +322,19 @@ void HousePalettePanel::OnListBoxChange(wxCommandEvent &event) {
 }
 
 void HousePalettePanel::OnListBoxDoubleClick(wxCommandEvent &event) {
-	House* house = reinterpret_cast<House*>(event.GetClientData());
-	// I find it extremly unlikely that one actually wants the exit at 0,0,0, so just treat it as the null value
-	if (house && house->getExit() != Position(0, 0, 0)) {
-		g_gui.SetScreenCenterPosition(house->getExit());
+	if (House* house = reinterpret_cast<House*>(event.GetClientData())) {
+		const Position &position = house->getExit();
+		if (!position.isValid()) {
+			// find a valid tile position
+			for (const Position &tilePosition : house->getTiles()) {
+				if (tilePosition.isValid()) {
+					g_gui.SetScreenCenterPosition(tilePosition);
+					break;
+				}
+			}
+		} else {
+			g_gui.SetScreenCenterPosition(position);
+		}
 	}
 }