about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--src/ap_state.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ap_state.cpp b/src/ap_state.cpp index aeed914..8feb78b 100644 --- a/src/ap_state.cpp +++ b/src/ap_state.cpp
@@ -241,8 +241,11 @@ struct APState {
241 pilgrimage_allows_paintings = 241 pilgrimage_allows_paintings =
242 slot_data.contains("pilgrimage_allows_paintings") && 242 slot_data.contains("pilgrimage_allows_paintings") &&
243 slot_data["pilgrimage_allows_paintings"].get<int>() == 1; 243 slot_data["pilgrimage_allows_paintings"].get<int>() == 1;
244 sunwarp_access = slot_data["sunwarp_access"].get<SunwarpAccess>(); 244 sunwarp_access = slot_data.contains("sunwarp_access")
245 sunwarp_shuffle = slot_data["shuffle_sunwarps"].get<int>() == 1; 245 ? slot_data["sunwarp_access"].get<SunwarpAccess>()
246 : kSUNWARP_ACCESS_NORMAL;
247 sunwarp_shuffle = slot_data.contains("shuffle_sunwarps") &&
248 slot_data["shuffle_sunwarps"].get<int>() == 1;
246 249
247 if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) { 250 if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
248 painting_mapping.clear(); 251 painting_mapping.clear();
@@ -380,7 +383,7 @@ struct APState {
380 } else { 383 } else {
381 data_storage.erase(key); 384 data_storage.erase(key);
382 } 385 }
383 386
384 TrackerLog("Data storage " + key + " retrieved as null"); 387 TrackerLog("Data storage " + key + " retrieved as null");
385 } 388 }
386 } 389 }