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.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ap_state.cpp b/src/ap_state.cpp index efa94bf..ea74c93 100644 --- a/src/ap_state.cpp +++ b/src/ap_state.cpp
@@ -60,6 +60,7 @@ struct APState {
60 LocationChecks location_checks = kNORMAL_LOCATIONS; 60 LocationChecks location_checks = kNORMAL_LOCATIONS;
61 VictoryCondition victory_condition = kTHE_END; 61 VictoryCondition victory_condition = kTHE_END;
62 bool early_color_hallways = false; 62 bool early_color_hallways = false;
63 bool pilgrimage_enabled = false;
63 SunwarpAccess sunwarp_access = kSUNWARP_ACCESS_NORMAL; 64 SunwarpAccess sunwarp_access = kSUNWARP_ACCESS_NORMAL;
64 65
65 std::map<std::string, std::string> painting_mapping; 66 std::map<std::string, std::string> painting_mapping;
@@ -129,6 +130,7 @@ struct APState {
129 location_checks = kNORMAL_LOCATIONS; 130 location_checks = kNORMAL_LOCATIONS;
130 victory_condition = kTHE_END; 131 victory_condition = kTHE_END;
131 early_color_hallways = false; 132 early_color_hallways = false;
133 pilgrimage_enabled = false;
132 sunwarp_access = kSUNWARP_ACCESS_NORMAL; 134 sunwarp_access = kSUNWARP_ACCESS_NORMAL;
133 135
134 connected = false; 136 connected = false;
@@ -224,6 +226,8 @@ struct APState {
224 slot_data["victory_condition"].get<VictoryCondition>(); 226 slot_data["victory_condition"].get<VictoryCondition>();
225 early_color_hallways = slot_data.contains("early_color_hallways") && 227 early_color_hallways = slot_data.contains("early_color_hallways") &&
226 slot_data["early_color_hallways"].get<int>() == 1; 228 slot_data["early_color_hallways"].get<int>() == 1;
229 pilgrimage_enabled = slot_data.contains("enable_pilgrimage") &&
230 slot_data["enable_pilgrimage"].get<int>() == 1;
227 sunwarp_access = slot_data["sunwarp_access"].get<SunwarpAccess>(); 231 sunwarp_access = slot_data["sunwarp_access"].get<SunwarpAccess>();
228 232
229 if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) { 233 if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
@@ -421,4 +425,6 @@ bool AP_HasAchievement(const std::string& achievement_name) {
421 425
422bool AP_HasEarlyColorHallways() { return GetState().early_color_hallways; } 426bool AP_HasEarlyColorHallways() { return GetState().early_color_hallways; }
423 427
428bool AP_IsPilgrimageEnabled() { return GetState().pilgrimage_enabled; }
429
424SunwarpAccess AP_GetSunwarpAccess() { return GetState().sunwarp_access; } 430SunwarpAccess AP_GetSunwarpAccess() { return GetState().sunwarp_access; }