From dd9acbbb43e56905dfd07b9ee962e7307b825e52 Mon Sep 17 00:00:00 2001 From: briaguya Date: Thu, 18 Aug 2022 12:19:57 -0400 Subject: [PATCH] use ordered map to help arrange checks in imgui --- soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp | 5 ++--- soh/soh/Enhancements/randomizer/randomizer_check_objects.h | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp index 494aed2a80..54a0647882 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp @@ -1,5 +1,4 @@ #include "randomizer_check_objects.h" -#include #include #include @@ -13,7 +12,7 @@ typedef struct { std::string rcSpoilerName; } RandomizerCheckObject; */ -std::unordered_map rcObjects = { +std::map rcObjects = { { RC_UNKNOWN_CHECK, {RC_UNKNOWN_CHECK, RCVORMQ_VANILLA, RCTYPE_STANDARD, RCAREA_INVALID, "Invalid Location", "Invalid Location"}}, { RC_KF_KOKIRI_SWORD_CHEST, {RC_KF_KOKIRI_SWORD_CHEST, RCVORMQ_VANILLA, RCTYPE_STANDARD, RCAREA_KOKIRI_FOREST, "Kokiri Sword Chest", "KF Kokiri Sword Chest"}}, { RC_KF_MIDOS_TOP_LEFT_CHEST, {RC_KF_MIDOS_TOP_LEFT_CHEST, RCVORMQ_VANILLA, RCTYPE_STANDARD, RCAREA_KOKIRI_FOREST, "Mido Top Left Chest", "KF Mido Top Left Chest"}}, @@ -806,7 +805,7 @@ std::map RandomizerCheckObjects::GetAllRCAreas return rcAreas; } -std::unordered_map RandomizerCheckObjects::GetAllRCObjects() { +std::map RandomizerCheckObjects::GetAllRCObjects() { return rcObjects; } diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.h b/soh/soh/Enhancements/randomizer/randomizer_check_objects.h index 14c7e80e65..27b2441b46 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.h +++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.h @@ -2,7 +2,6 @@ #include "randomizerTypes.h" #include #include -#include // Check types based on main settings typedef enum { @@ -77,6 +76,6 @@ namespace RandomizerCheckObjects { bool AreaIsDungeon(RandomizerCheckArea area); bool AreaIsOverworld(RandomizerCheckArea area); std::map GetAllRCAreas(); - std::unordered_map GetAllRCObjects(); + std::map GetAllRCObjects(); RandomizerCheckObject GetRCObject(RandomizerCheck check); } \ No newline at end of file