diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-07-16 15:17:21 -0400 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2024-07-16 15:17:21 -0400 |
commit | 558fcd9bf0852b5c909822c374f7e445b63026e5 (patch) | |
tree | f78d74f389c63f83da1878c9982de9a8e3343df0 /src/game_data.h | |
parent | 2944687cbbaa53d0815fea9f5f2506500e2e1db3 (diff) | |
parent | a40d5a90a4759ecb03fe4591878c011d3c8c07be (diff) | |
download | lingo-ap-tracker-558fcd9bf0852b5c909822c374f7e445b63026e5.tar.gz lingo-ap-tracker-558fcd9bf0852b5c909822c374f7e445b63026e5.tar.bz2 lingo-ap-tracker-558fcd9bf0852b5c909822c374f7e445b63026e5.zip |
Merge branch 'main' into panels
Diffstat (limited to 'src/game_data.h')
-rw-r--r-- | src/game_data.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game_data.h b/src/game_data.h index aca4c3d..197585c 100644 --- a/src/game_data.h +++ b/src/game_data.h | |||
@@ -22,6 +22,7 @@ enum class LingoColor { | |||
22 | constexpr int kLOCATION_NORMAL = 1; | 22 | constexpr int kLOCATION_NORMAL = 1; |
23 | constexpr int kLOCATION_REDUCED = 2; | 23 | constexpr int kLOCATION_REDUCED = 2; |
24 | constexpr int kLOCATION_INSANITY = 4; | 24 | constexpr int kLOCATION_INSANITY = 4; |
25 | constexpr int kLOCATION_SMALL_SPHERE_ONE = 8; | ||
25 | 26 | ||
26 | enum class EntranceType { | 27 | enum class EntranceType { |
27 | kNormal, | 28 | kNormal, |
@@ -89,6 +90,7 @@ struct PanelDoor { | |||
89 | }; | 90 | }; |
90 | 91 | ||
91 | struct Exit { | 92 | struct Exit { |
93 | int source_room; | ||
92 | int destination_room; | 94 | int destination_room; |
93 | std::optional<int> door; | 95 | std::optional<int> door; |
94 | EntranceType type = EntranceType::kNormal; | 96 | EntranceType type = EntranceType::kNormal; |
@@ -172,7 +174,7 @@ const std::vector<int>& GD_GetSunwarpDoors(); | |||
172 | int GD_GetRoomForSunwarp(int index); | 174 | int GD_GetRoomForSunwarp(int index); |
173 | const std::vector<SubwayItem>& GD_GetSubwayItems(); | 175 | const std::vector<SubwayItem>& GD_GetSubwayItems(); |
174 | const SubwayItem& GD_GetSubwayItem(int id); | 176 | const SubwayItem& GD_GetSubwayItem(int id); |
175 | int GD_GetSubwayItemForPainting(const std::string& painting_id); | 177 | std::optional<int> GD_GetSubwayItemForPainting(const std::string& painting_id); |
176 | int GD_GetSubwayItemForSunwarp(const SubwaySunwarp& sunwarp); | 178 | int GD_GetSubwayItemForSunwarp(const SubwaySunwarp& sunwarp); |
177 | 179 | ||
178 | #endif /* end of include guard: GAME_DATA_H_9C42AC51 */ | 180 | #endif /* end of include guard: GAME_DATA_H_9C42AC51 */ |