tiberium/CNC_TS_and_RA2_Mission_Editor
1
0
Fork 0
mirror of https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git synced 2025-07-17 19:56:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

#25, fixed waypoint related issue .

Browse source
This commit is contained in:
Zero Fanker 2024-06-17 13:34:12 -04:00
parent 29caa6b9d8
commit f5817e91ff
7 changed files with 46 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

44
MissionEditor/MapData.cpp
View file

@ -1872,15 +1872,11 @@ void CMapData::DeleteInfantry(DWORD dwIndex)
}
void CMapData::DeleteWaypoint(DWORD dwIndex)
void CMapData::DeleteWaypoint(DWORD dwId)
{
if (dwIndex >= GetWaypointCount()) {
return;
}
CString id;
DWORD pos;
Map->GetWaypointData(dwIndex, &id, &pos);
Map->GetWaypointData(dwId, &id, &pos);
int x = pos % m_IsoSize;
int y = pos / m_IsoSize;
@ -1895,9 +1891,11 @@ void CMapData::DeleteWaypoint(DWORD dwIndex)
}
int k, l;
for (k = -1; k < 2; k++)
for (l = -1; l < 2; l++)
for (k = -1; k < 2; k++) {
for (l = -1; l < 2; l++) {
Mini_UpdatePos(x + k, y + l, IsMultiplayer());
}
}
}
void CMapData::DeleteCelltag(DWORD dwIndex)
@ -2771,7 +2769,7 @@ BOOL CMapData::IsGroundObjectAt(DWORD dwPos) const
}
void CMapData::GetWaypointData(DWORD dwIndex, CString* lpID, DWORD* lpdwPos) const
void CMapData::GetNthWaypointData(DWORD dwIdx, CString* lpID, DWORD* lpdwPos) const
{
if (lpID) {
*lpID = "";
@ -2780,11 +2778,7 @@ void CMapData::GetWaypointData(DWORD dwIndex, CString* lpID, DWORD* lpdwPos) con
*lpdwPos = 0;
}
auto const& section = m_mapfile.GetSection("Waypoints");
CString id;
id.Format("%d", dwIndex);
auto const& data = section.GetString(id);
auto const& [id, data] = m_mapfile.GetSection("Waypoints").Nth(dwIdx);
if (data.IsEmpty()) {
return;
@ -2801,6 +2795,26 @@ void CMapData::GetWaypointData(DWORD dwIndex, CString* lpID, DWORD* lpdwPos) con
}
}
void CMapData::GetWaypointData(DWORD dwId, CString* lpID, DWORD* lpdwPos) const
{
if (lpID) {
*lpID = "";
}
if (lpdwPos) {
*lpdwPos = 0;
}
CString id;
id.Format("%d", dwId);
auto const& section = m_mapfile.GetSection("Waypoints");
auto const idx = section.FindIndex(id);
if (idx >= 0 && idx < section.Size()) {
GetNthWaypointData(idx, lpID, lpdwPos);
}
}
void CMapData::GetStdAircraftData(DWORD dwIndex, STDOBJECTDATA* lpStdAircraft) const
{
auto const& section = m_mapfile.GetSection("Aircraft");
@ -6094,7 +6108,7 @@ void CMapData::ResizeMap(int iLeft, int iTop, DWORD dwNewWidth, DWORD dwNewHeigh
DWORD pos;
CString id;
GetWaypointData(i, &id, &pos);
GetNthWaypointData(i, &id, &pos);
wp_id[i] = id;
wp_pos[i] = pos;