about summary refs log tree commit diff stats
path: root/src/ap_state.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ap_state.cpp')
-rw-r--r--src/ap_state.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/ap_state.cpp b/src/ap_state.cpp index 1937597..bdd9cb2 100644 --- a/src/ap_state.cpp +++ b/src/ap_state.cpp
@@ -64,6 +64,8 @@ struct APState {
64 VictoryCondition victory_condition = kTHE_END; 64 VictoryCondition victory_condition = kTHE_END;
65 bool early_color_hallways = false; 65 bool early_color_hallways = false;
66 bool pilgrimage_enabled = false; 66 bool pilgrimage_enabled = false;
67 bool pilgrimage_allows_roof_access = false;
68 bool pilgrimage_allows_paintings = false;
67 SunwarpAccess sunwarp_access = kSUNWARP_ACCESS_NORMAL; 69 SunwarpAccess sunwarp_access = kSUNWARP_ACCESS_NORMAL;
68 70
69 std::map<std::string, std::string> painting_mapping; 71 std::map<std::string, std::string> painting_mapping;
@@ -135,6 +137,8 @@ struct APState {
135 victory_condition = kTHE_END; 137 victory_condition = kTHE_END;
136 early_color_hallways = false; 138 early_color_hallways = false;
137 pilgrimage_enabled = false; 139 pilgrimage_enabled = false;
140 pilgrimage_allows_roof_access = false;
141 pilgrimage_allows_paintings = false;
138 sunwarp_access = kSUNWARP_ACCESS_NORMAL; 142 sunwarp_access = kSUNWARP_ACCESS_NORMAL;
139 143
140 connected = false; 144 connected = false;
@@ -240,6 +244,12 @@ struct APState {
240 slot_data["early_color_hallways"].get<int>() == 1; 244 slot_data["early_color_hallways"].get<int>() == 1;
241 pilgrimage_enabled = slot_data.contains("enable_pilgrimage") && 245 pilgrimage_enabled = slot_data.contains("enable_pilgrimage") &&
242 slot_data["enable_pilgrimage"].get<int>() == 1; 246 slot_data["enable_pilgrimage"].get<int>() == 1;
247 pilgrimage_allows_roof_access =
248 slot_data.contains("pilgrimage_allows_roof_access") &&
249 slot_data["pilgrimage_allows_roof_access"].get<int>() == 1;
250 pilgrimage_allows_paintings =
251 slot_data.contains("pilgrimage_allows_paintings") &&
252 slot_data["pilgrimage_allows_paintings"].get<int>() == 1;
243 sunwarp_access = slot_data["sunwarp_access"].get<SunwarpAccess>(); 253 sunwarp_access = slot_data["sunwarp_access"].get<SunwarpAccess>();
244 254
245 if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) { 255 if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
@@ -454,6 +464,14 @@ bool AP_HasEarlyColorHallways() { return GetState().early_color_hallways; }
454 464
455bool AP_IsPilgrimageEnabled() { return GetState().pilgrimage_enabled; } 465bool AP_IsPilgrimageEnabled() { return GetState().pilgrimage_enabled; }
456 466
467bool AP_DoesPilgrimageAllowRoofAccess() {
468 return GetState().pilgrimage_allows_roof_access;
469}
470
471bool AP_DoesPilgrimageAllowPaintings() {
472 return GetState().pilgrimage_allows_paintings;
473}
474
457SunwarpAccess AP_GetSunwarpAccess() { return GetState().sunwarp_access; } 475SunwarpAccess AP_GetSunwarpAccess() { return GetState().sunwarp_access; }
458 476
459bool AP_HasReachedGoal() { return GetState().HasReachedGoal(); } 477bool AP_HasReachedGoal() { return GetState().HasReachedGoal(); }