Added real pilgrimage detection

1 files changed, 10 insertions, 4 deletions

@@ -23,6 +23,14 @@ constexpr int kLOCATION_NORMAL = 1;
 constexpr int kLOCATION_REDUCED = 2;
 constexpr int kLOCATION_INSANITY = 4;
 
+enum class EntranceType {
+  kNormal,
+  kPainting,
+  kSunwarp,
+  kWarp,
+  kPilgrimage,
+};
+
 struct Panel {
   int id;
   int room;
@@ -66,9 +74,7 @@ struct Door {
 struct Exit {
   int destination_room;
   std::optional<int> door;
-  bool painting = false;
-  bool sunwarp = false;
-  bool pilgrimage = false;
+  EntranceType type = EntranceType::kNormal;
 };
 
 struct PaintingExit {
@@ -109,10 +115,10 @@ int GD_GetRoomByName(const std::string& name);
 const Room& GD_GetRoom(int room_id);
 const std::vector<Door>& GD_GetDoors();
 const Door& GD_GetDoor(int door_id);
+int GD_GetDoorByName(const std::string& name);
 const Panel& GD_GetPanel(int panel_id);
 int GD_GetRoomForPainting(const std::string& painting_id);
 const std::vector<int>& GD_GetAchievementPanels();
 int GD_GetItemIdForColor(LingoColor color);
-const std::vector<int>& GD_GetPilgrimageDoors(bool include_sunwarps);
 
 #endif /* end of include guard: GAME_DATA_H_9C42AC51 */