Merge branch 'testing-out-item-replacement' into testing-out-item-replacement-melon

This commit is contained in:
MelonSpeedruns 2022-05-27 16:44:25 -04:00
commit 60be37fce5

View file

@ -510,6 +510,7 @@ std::unordered_map<std::string, RandomizerGet> SpoilerfileGetNameToEnum = {
void Randomizer::PopulateItemLocations(std::string spoilerFileName) { void Randomizer::PopulateItemLocations(std::string spoilerFileName) {
// todo pull this in from cvar or something // todo pull this in from cvar or something
std::ifstream spoilerFileStream("spoiler.json"); std::ifstream spoilerFileStream("spoiler.json");
if (!spoilerFileStream) return;
json spoilerFileJson; json spoilerFileJson;
spoilerFileStream >> spoilerFileJson; spoilerFileStream >> spoilerFileJson;
json locationsJson = spoilerFileJson["locations"]; json locationsJson = spoilerFileJson["locations"];