about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2023-11-17 12:39:24 -0500
committerStar Rauchenberger <fefferburbia@gmail.com>2023-11-17 12:39:24 -0500
commit3b49bdc6c73946b4132fe7bc119208e559995f67 (patch)
tree315d66d2d0193944ecd7a316949762fdce658365
parent4adfe42a300a597cf8e7036cd189d197b08a7f01 (diff)
downloadlingo-ap-tracker-3b49bdc6c73946b4132fe7bc119208e559995f67.tar.gz
lingo-ap-tracker-3b49bdc6c73946b4132fe7bc119208e559995f67.tar.bz2
lingo-ap-tracker-3b49bdc6c73946b4132fe7bc119208e559995f67.zip
Fixed hunt-only areas not showing up for hunts
-rw-r--r--src/game_data.cpp1
-rw-r--r--src/game_data.h1
-rw-r--r--src/tracker_panel.cpp3
3 files changed, 4 insertions, 1 deletions
diff --git a/src/game_data.cpp b/src/game_data.cpp index 2022097..31e23ec 100644 --- a/src/game_data.cpp +++ b/src/game_data.cpp
@@ -550,6 +550,7 @@ struct GameData {
550 for (MapArea &map_area : map_areas_) { 550 for (MapArea &map_area : map_areas_) {
551 for (const Location &location : map_area.locations) { 551 for (const Location &location : map_area.locations) {
552 map_area.classification |= location.classification; 552 map_area.classification |= location.classification;
553 map_area.hunt |= location.hunt;
553 } 554 }
554 } 555 }
555 556
diff --git a/src/game_data.h b/src/game_data.h index 721ecc6..8a38264 100644 --- a/src/game_data.h +++ b/src/game_data.h
@@ -98,6 +98,7 @@ struct MapArea {
98 int map_x; 98 int map_x;
99 int map_y; 99 int map_y;
100 int classification = 0; 100 int classification = 0;
101 bool hunt = false;
101}; 102};
102 103
103const std::vector<MapArea>& GD_GetMapAreas(); 104const std::vector<MapArea>& GD_GetMapAreas();
diff --git a/src/tracker_panel.cpp b/src/tracker_panel.cpp index f6fed25..5e035af 100644 --- a/src/tracker_panel.cpp +++ b/src/tracker_panel.cpp
@@ -104,7 +104,8 @@ void TrackerPanel::Redraw() {
104 104
105 for (AreaIndicator &area : areas_) { 105 for (AreaIndicator &area : areas_) {
106 const MapArea &map_area = GD_GetMapArea(area.area_id); 106 const MapArea &map_area = GD_GetMapArea(area.area_id);
107 if (!AP_IsLocationVisible(map_area.classification)) { 107 if (!AP_IsLocationVisible(map_area.classification) &&
108 !(map_area.hunt && GetTrackerConfig().show_hunt_panels)) {
108 area.active = false; 109 area.active = false;
109 continue; 110 continue;
110 } else { 111 } else {