Fix the problem that the map editor crashes when placing building nea…

…r the map boundary
secsome · Aug 31, 2023 · 6c30c32 · 6c30c32
1 parent 55cafea
commit 6c30c32
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/FA2pp b/FA2pp
diff --git a/FA2sp/Ext/CMapValidator/Body.cpp b/FA2sp/Ext/CMapValidator/Body.cpp
@@ -36,13 +36,21 @@ void CMapValidatorExt::ValidateStructureOverlapping(BOOL& result)
 				for (int dx = 0; dx < DataExt.Height; ++dx)
 				{
 					for (int dy = 0; dy < DataExt.Width; ++dy)
-						Occupied[CMapData::Instance->GetCoordIndex(X + dx, Y + dy)].emplace_back(splits[1].m_pchData);
+					{
+						MapCoord coord = { X + dx, Y + dy };
+						if (CMapData::Instance->IsCoordInMap(coord.X, coord.Y))
+							Occupied[CMapData::Instance->GetCoordIndex(coord.X, coord.Y)].emplace_back(splits[1].m_pchData);
+					}
 				}
 			}
 			else
 			{
 				for (const auto& block : *DataExt.Foundations)
-					Occupied[CMapData::Instance->GetCoordIndex(X + block.Y, Y + block.X)].emplace_back(splits[1].m_pchData);
+				{
+					MapCoord coord = { X + block.Y, Y + block.X };
+					if (CMapData::Instance->IsCoordInMap(coord.X, coord.Y))
+						Occupied[CMapData::Instance->GetCoordIndex(coord.X, coord.Y)].emplace_back(splits[1].m_pchData);
+				}
 			}
 		}
 	}

diff --git a/FA2sp/Ext/CPropertyBuilding/Hooks.cpp b/FA2sp/Ext/CPropertyBuilding/Hooks.cpp
@@ -68,7 +68,7 @@ DEFINE_HOOK(417F40, CPropertyBuilding_OnInitDialog, 7)
                 for (const auto& upgrade : upgrades)
                 {
                     const auto UIName = CMapData::Instance->GetUIName(upgrade.c_str());
-                    const auto name = std::format("{} ({})", upgrade, UIName);
+                    const auto name = std::format("{} ({})", upgrade, UIName.m_pchData);
 
                     for (int i = 0; i < nUpgrades; ++i)
                         pUpgrades[i]->AddString(name.c_str());