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-05-01 01:21:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

#25, fixed waypoint sequence issue .

Browse source
This commit is contained in:
Zero Fanker 2024-06-17 01:10:11 -04:00
parent 58b0de0907
commit 29caa6b9d8
2 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MissionEditor/IsoView.cpp
View file

@ -1521,8 +1521,7 @@ void CIsoView::OnMouseMove(UINT nFlags, CPoint point)
OnLButtonDown(nFlags, point);
} else if ((nFlags & MK_LBUTTON) && (nFlags & MK_SHIFT) && AD.mode == ACTIONMODE_LOWERTILE) {
OnLButtonDown(nFlags, point);
} else if ((nFlags == MK_LBUTTON) && AD.mode == ACTIONMODE_WAYPOINT) // waypoints
{
} else if ((nFlags == MK_LBUTTON) && AD.mode == ACTIONMODE_WAYPOINT) { // waypoints
if (AD.type == 1) {
//delete waypoint
int w = Map->GetWaypointAt(x + y * Map->GetIsoSize());

46
MissionEditor/MapData.cpp
View file

@ -1712,11 +1712,14 @@ void CMapData::UpdateWaypoints(BOOL bSave)
for (i = 0; i < sec.Size(); i++) {
int x, y;
PosToXY(sec.Nth(i).second, &x, &y);
auto const& [id, coord] = sec.Nth(i);
PosToXY(coord, &x, &y);
int pos = x + y * GetIsoSize();
if (pos < 0 || pos >= fielddata_size) continue;
fielddata[pos].waypoint = i;
if (pos < 0 || pos >= fielddata_size) {
continue;
}
fielddata[pos].waypoint = atoi(id);
int k, l;
for (k = -1; k < 2; k++)
@ -1871,7 +1874,9 @@ void CMapData::DeleteInfantry(DWORD dwIndex)
void CMapData::DeleteWaypoint(DWORD dwIndex)
{
if (dwIndex >= GetWaypointCount()) return;
if (dwIndex >= GetWaypointCount()) {
return;
}
CString id;
DWORD pos;
@ -1883,7 +1888,7 @@ void CMapData::DeleteWaypoint(DWORD dwIndex)
auto const pSec = m_mapfile.TryGetSection("Waypoints");
ASSERT(pSec != nullptr);
pSec->RemoveAt(dwIndex);
pSec->RemoveByKey(id);
if (!m_noAutoObjectUpdate) {
UpdateWaypoints(FALSE);
@ -2026,19 +2031,17 @@ void CMapData::DeleteNode(LPCTSTR lpHouse, DWORD dwIndex)
UpdateNodes(FALSE);
}
BOOL CMapData::AddWaypoint(CString lpID, DWORD dwPos)
BOOL CMapData::AddWaypoint(CString id, DWORD dwPos)
{
// create waypoint, auto number
CString id = lpID;
if (lpID.GetLength() == 0) id = GetFree("Waypoints");
if (id.IsEmpty()) {
id = GetFree("Waypoints");
}
char j[15];
char k[15];
memset(j, 0, 15);
memset(k, 0, 15);
memset(j, 0, sizeof(j));
memset(k, 0, sizeof(k));
itoa(dwPos / GetIsoSize(), j, 10);
if (strlen(j) < 3) {
strcpy_safe(j + 1, j);
@ -2053,8 +2056,13 @@ BOOL CMapData::AddWaypoint(CString lpID, DWORD dwPos)
//MessageBox(0,k,"",0);
auto pSec = m_mapfile.TryGetSection("Waypoints");
if (!pSec) {
pSec = &m_mapfile.AddSection("Waypoints");
}
pSec->Insert(std::move(id), k);
m_mapfile.SetString("Waypoints", id, k);
if (!m_noAutoObjectUpdate) {
UpdateWaypoints(FALSE);
}
@ -2773,12 +2781,15 @@ void CMapData::GetWaypointData(DWORD dwIndex, CString* lpID, DWORD* lpdwPos) con
}
auto const& section = m_mapfile.GetSection("Waypoints");
if (dwIndex >= section.Size()) {
CString id;
id.Format("%d", dwIndex);
auto const& data = section.GetString(id);
if (data.IsEmpty()) {
return;
}
auto const& [id, data] = section.Nth(dwIndex);
int x, y;
PosToXY(data, &x, &y);
@ -2788,7 +2799,6 @@ void CMapData::GetWaypointData(DWORD dwIndex, CString* lpID, DWORD* lpdwPos) con
if (lpdwPos) {
*lpdwPos = x + y * GetIsoSize();
}
}
void CMapData::GetStdAircraftData(DWORD dwIndex, STDOBJECTDATA* lpStdAircraft) const