Fixed remaining thread unsafe APState/IPCState reads

Still would like to add some kind of wrapper object that TrackerState could use to read APState without locking, since it'll only ever be called from the thread that would do the mutating, but this is fine for now.

1 files changed, 3 insertions, 6 deletions

@@ -68,13 +68,11 @@ bool AP_IsColorShuffle();
 
 bool AP_IsPaintingShuffle();
 
-// WARNING: Not thread-safe!
-const std::map<std::string, std::string>& AP_GetPaintingMapping();
+std::map<std::string, std::string> AP_GetPaintingMapping();
 
 bool AP_IsPaintingMappedTo(const std::string& painting_id);
 
-// WARNING: Not thread-safe!
-const std::set<std::string>& AP_GetCheckedPaintings();
+std::set<std::string> AP_GetCheckedPaintings();
 
 bool AP_IsPaintingChecked(const std::string& painting_id);
 
@@ -100,8 +98,7 @@ SunwarpAccess AP_GetSunwarpAccess();
 
 bool AP_IsSunwarpShuffle();
 
-// WARNING: Not thread-safe!
-const std::map<int, SunwarpMapping>& AP_GetSunwarpMapping();
+std::map<int, SunwarpMapping> AP_GetSunwarpMapping();
 
 bool AP_HasReachedGoal();