From 14072b8bdd861f59cacf985d65227637f681e707 Mon Sep 17 00:00:00 2001
From: Zero Fanker <zcyfksn@vip.qq.com>
Date: Tue, 9 Apr 2024 23:16:39 -0400
Subject: [PATCH] ++

---
 MissionEditor/Unit.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/MissionEditor/Unit.cpp b/MissionEditor/Unit.cpp
index 42b716b..718b202 100644
--- a/MissionEditor/Unit.cpp
+++ b/MissionEditor/Unit.cpp
@@ -88,15 +88,15 @@ void CUnit::Init(CString house, CString strength, CString direction, CString act
 {
 	CIniFile& ini=Map->GetIniFile();
 
-	if(house=="") 
-	{
-		m_house=*rules.sections["Houses"].GetValue(0);
-		if(ini.sections.find("Houses")!=ini.sections.end())
-			if(ini.sections["Houses"].values.size()>0)
-				m_house=TranslateHouse(*ini.sections["Houses"].GetValue(0), TRUE);
+	if (house.IsEmpty()) {
+		auto const& houseSec = rules["Houses"];
+		m_house = houseSec.Nth(0).second;
+		if (houseSec.Size() > 0) {
+			m_house = TranslateHouse(m_house, TRUE);
+		}
+	} else {
+		m_house = TranslateHouse(house, TRUE);
 	}
-	else
-		m_house=TranslateHouse(house, TRUE);
 
 	m_flag1=flag1;
 	m_flag2=flag2;