From b7e34326a06db07f143a51fd0d9abc5bddd3e03b Mon Sep 17 00:00:00 2001 From: Zero Fanker Date: Sun, 7 Apr 2024 11:56:03 -0400 Subject: [PATCH] ++ --- MissionEditor/MapD.cpp | 8 ++++---- MissionEditor/MapData.h | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/MissionEditor/MapD.cpp b/MissionEditor/MapD.cpp index 238fa46..daa575d 100644 --- a/MissionEditor/MapD.cpp +++ b/MissionEditor/MapD.cpp @@ -82,9 +82,9 @@ void CMapD::UpdateDialog() { CIniFile& ini=Map->GetIniFile(); - m_LocalSize.SetWindowText( ini.sections["Map"].values["LocalSize"] ); + m_LocalSize.SetWindowText(ini.GetString("Map", "LocalSize")); //m_Size.SetWindowText( ini.sections["Map"].values["Size"] ); - m_Theater.SetWindowText( ini.sections["Map"].values["Theater"] ); + m_Theater.SetWindowText(ini.GetString("Map", "Theater")); char c[50]; itoa(Map->GetWidth(), c, 10); @@ -108,7 +108,7 @@ void CMapD::OnChangeUsesize() void CMapD::OnEditchangeTheater() { CIniFile& ini=Map->GetIniFile(); - ini.sections["Map"].values["Theater"]=GetText(&m_Theater); + ini.SetString("Map", "Theater", GetText(&m_Theater)); } void CMapD::UpdateStrings() @@ -125,7 +125,7 @@ void CMapD::UpdateStrings() void CMapD::OnChangelocal() { CIniFile& ini=Map->GetIniFile(); - ini.sections["Map"].values["LocalSize"]=GetText(&m_LocalSize); + ini.SetString("Map", "LocalSize", GetText(&m_LocalSize)); Map->CalcMapRect(); ((CFinalSunDlg*)theApp.m_pMainWnd)->m_view.m_isoview->RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); diff --git a/MissionEditor/MapData.h b/MissionEditor/MapData.h index ddbc43f..11c9ae6 100644 --- a/MissionEditor/MapData.h +++ b/MissionEditor/MapData.h @@ -316,7 +316,7 @@ public: int rampbase = rampset_start;//atoi((*tiles).sections["General"].values["RampBase"]); - int rampsmooth = atoi((*tiles).sections["General"].AccessValueByName("RampSmooth")); + int rampsmooth = tiles->GetInteger("General", "RampSmooth"); if (ns == -1 && (d.wTileSet == rampset || d.wTileSet == rampsmooth) && d.bMorphable) { @@ -360,8 +360,7 @@ public: if (dwPos > fielddata_size) return FALSE; int replacement = 0; // MW fix: ignore for bridges - if ((*tiledata)[dwID].bReplacementCount && atoi((*tiles).sections["General"].AccessValueByName("BridgeSet")) != (*tiledata)[dwID].wTileSet) - { + if ((*tiledata)[dwID].bReplacementCount && tiles->GetInteger("General", "BridgeSet") != (*tiledata)[dwID].wTileSet) { replacement = rand() * (1 + (*tiledata)[dwID].bReplacementCount) / RAND_MAX; } @@ -1000,7 +999,7 @@ public: #endif BOOL IsYRMap(); - BOOL IsMapSection(LPCSTR lpSectionName); + bool IsMapSection(const CString& sectionName); void ResizeMap(int iLeft, int iTop, DWORD dwNewWidth, DWORD dwNewHeight); void SmoothTiberium(DWORD dwPos); int GetPowerOfHouse(LPCTSTR lpHouse);