From f24951d3ec8cfc90db1b8b7a25bb982a8bbf734f Mon Sep 17 00:00:00 2001
From: Zero Fanker <zcyfksn@vip.qq.com>
Date: Sun, 7 Apr 2024 11:55:49 -0400
Subject: [PATCH] ++

---
 MissionEditor/NewMap.cpp      | 12 +++++-------
 MissionEditor/NewMapSpDlg.cpp |  5 ++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/MissionEditor/NewMap.cpp b/MissionEditor/NewMap.cpp
index c7b9e2d..7ba9409 100644
--- a/MissionEditor/NewMap.cpp
+++ b/MissionEditor/NewMap.cpp
@@ -118,14 +118,13 @@ BOOL CNewMap::OnInitDialog()
 
 	CComboBox& house=*((CComboBox*)(GetDlgItem(IDC_HOUSE)));
 	int i;
-	for(i=0;i<rules.sections[HOUSES].values.size();i++)
-	{
-		house.AddString(*rules.sections[HOUSES].GetValue(i));
+	for (auto const& [seq, id] : rules[HOUSES]) {
+		house.AddString(id);
 	}
 
-	m_House=rules.sections[HOUSES].values["0"];
+	m_House = rules[HOUSES].Nth(0).second;
 
-	CComboBox& theater=*((CComboBox*)GetDlgItem(IDC_THEATER));
+	CComboBox& theater = *((CComboBox*)GetDlgItem(IDC_THEATER));
 	theater.AddString(THEATER0);
 	theater.AddString(THEATER1);
 #ifdef RA2_MODE
@@ -265,8 +264,7 @@ void CNewMap::OnEditchangeImportfile()
 
 	cmap.InsertFile(m_MapToImport,"Map");
 	
-	if(cmap.sections.find("Map")==cmap.sections.end())
-	{
+	if (!cmap.TryGetSection("Map")) {
 		m_OK.EnableWindow(FALSE);
 		return;
 	}
diff --git a/MissionEditor/NewMapSpDlg.cpp b/MissionEditor/NewMapSpDlg.cpp
index 379ac17..23a2b1e 100644
--- a/MissionEditor/NewMapSpDlg.cpp
+++ b/MissionEditor/NewMapSpDlg.cpp
@@ -84,9 +84,8 @@ BOOL CNewMapSpDlg::OnInitDialog()
 	
 	CComboBox& house=*((CComboBox*)(GetDlgItem(IDC_HOUSE)));
 	int i;
-	for(i=0;i<rules.sections[HOUSES].values.size();i++)
-	{
-		house.AddString(TranslateHouse(*rules.sections[HOUSES].GetValue(i), TRUE));
+	for (auto const& [seq, id] : rules[HOUSES]) {
+		house.AddString(TranslateHouse(id, TRUE));
 	}
 
 	m_PrepareHouses=TRUE;