mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-31 09:31:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

use ordered map to help arrange checks in imgui

Browse Source
This commit is contained in:
briaguya
2022-08-18 12:19:57 -04:00
parent 5ac69e0bd8
commit dd9acbbb43
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+2 -3
View File
@@ -1,5 +1,4 @@
#include "randomizer_check_objects.h"
#include <unordered_map>
#include <map>
#include <string>
@@ -13,7 +12,7 @@ typedef struct {
std::string rcSpoilerName;
} RandomizerCheckObject;
*/
std::unordered_map<RandomizerCheck, RandomizerCheckObject> rcObjects = {
std::map<RandomizerCheck, RandomizerCheckObject> 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<RandomizerCheckArea, std::string> RandomizerCheckObjects::GetAllRCAreas
return rcAreas;
}
std::unordered_map<RandomizerCheck, RandomizerCheckObject> RandomizerCheckObjects::GetAllRCObjects() {
std::map<RandomizerCheck, RandomizerCheckObject> RandomizerCheckObjects::GetAllRCObjects() {
return rcObjects;
}
soh/soh/Enhancements/randomizer/randomizer_check_objects.h
+1 -2
View File
@@ -2,7 +2,6 @@
#include "randomizerTypes.h"
#include <string>
#include <map>
#include <unordered_map>
// Check types based on main settings
typedef enum {
@@ -77,6 +76,6 @@ namespace RandomizerCheckObjects {
bool AreaIsDungeon(RandomizerCheckArea area);
bool AreaIsOverworld(RandomizerCheckArea area);
std::map<RandomizerCheckArea, std::string> GetAllRCAreas();
std::unordered_map<RandomizerCheck, RandomizerCheckObject> GetAllRCObjects();
std::map<RandomizerCheck, RandomizerCheckObject> GetAllRCObjects();
RandomizerCheckObject GetRCObject(RandomizerCheck check);
}