diff --git a/MissionEditor/Aircraft.cpp b/MissionEditor/Aircraft.cpp index 271f02c..7fb8b63 100644 --- a/MissionEditor/Aircraft.cpp +++ b/MissionEditor/Aircraft.cpp @@ -46,7 +46,7 @@ CAircraft::CAircraft(CWnd* pParent /*=NULL*/) m_direction = _T(""); m_house = _T(""); m_flag1 = _T(""); - m_flag2 = _T(""); + m_group = _T(""); m_flag3 = _T(""); m_flag4 = _T(""); m_action = _T(""); @@ -63,7 +63,7 @@ void CAircraft::DoDataExchange(CDataExchange* pDX) DDX_CBString(pDX, IDC_DIRECTION, m_direction); DDX_CBString(pDX, IDC_HOUSE, m_house); DDX_Text(pDX, IDC_P1, m_flag1); - DDX_Text(pDX, IDC_P2, m_flag2); + DDX_Text(pDX, IDC_P2, m_group); DDX_Text(pDX, IDC_P3, m_flag3); DDX_Text(pDX, IDC_P4, m_flag4); DDX_CBString(pDX, IDC_STATE, m_action); @@ -80,7 +80,7 @@ END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// // handlers for messages CAircraft -void CAircraft::Init(CString house, CString strength, CString direction, CString action, CString tag, CString flag1, CString flag2, CString flag3, CString flag4) +void CAircraft::Init(CString house, CString strength, CString direction, CString action, CString tag, CString flag1, CString group, CString flag3, CString flag4) { if (house.GetLength() == 0) { m_house = TranslateHouse(Map->GetHouseID(0), TRUE); @@ -90,7 +90,7 @@ void CAircraft::Init(CString house, CString strength, CString direction, CString m_flag1 = flag1; - m_flag2 = flag2; + m_group = group; m_flag3 = flag3; m_flag4 = flag4; @@ -139,7 +139,7 @@ void CAircraft::OnOK() m_house = TranslateHouse(m_house, FALSE); TruncSpace(m_tag); TruncSpace(m_flag1); - TruncSpace(m_flag2); + TruncSpace(m_group); TruncSpace(m_flag3); TruncSpace(m_flag4); diff --git a/MissionEditor/Aircraft.h b/MissionEditor/Aircraft.h index 5f8fa25..75d0f2f 100644 --- a/MissionEditor/Aircraft.h +++ b/MissionEditor/Aircraft.h @@ -40,7 +40,7 @@ public: CString action = "Guard", CString tag = "None", CString flag1 = "0", - CString flag2 = "0", + CString group = "-1", CString flag3 = "0", CString flag4 = "0"); CAircraft(CWnd* pParent = NULL); // standard constructor @@ -52,7 +52,7 @@ public: CString m_direction; CString m_house; CString m_flag1; - CString m_flag2; + CString m_group; CString m_flag3; CString m_flag4; CString m_action; diff --git a/MissionEditor/Infantry.cpp b/MissionEditor/Infantry.cpp index f0196da..5e0bbf7 100644 --- a/MissionEditor/Infantry.cpp +++ b/MissionEditor/Infantry.cpp @@ -47,7 +47,7 @@ CInfantrie::CInfantrie(CWnd* pParent /*=NULL*/) m_direction = _T(""); m_house = _T(""); m_flag1 = _T(""); - m_flag2 = _T(""); + m_group = _T(""); m_flag3 = _T(""); m_flag4 = _T(""); m_action = _T(""); @@ -66,7 +66,7 @@ void CInfantrie::DoDataExchange(CDataExchange* pDX) DDX_CBString(pDX, IDC_DIRECTION, m_direction); DDX_CBString(pDX, IDC_HOUSE, m_house); DDX_Text(pDX, IDC_P1, m_flag1); - DDX_Text(pDX, IDC_P2, m_flag2); + DDX_Text(pDX, IDC_P2, m_group); DDX_Text(pDX, IDC_P3, m_flag3); DDX_Text(pDX, IDC_P4, m_flag4); DDX_CBString(pDX, IDC_STATE, m_action); @@ -121,7 +121,7 @@ void CInfantrie::OnOK() } -void CInfantrie::Init(CString house, CString strength, CString action, CString direction, CString tag, CString flag1, CString flag2, CString flag3, CString flag4, CString flag5) +void CInfantrie::Init(CString house, CString strength, CString action, CString direction, CString tag, CString flag1, CString group, CString flag3, CString flag4, CString flag5) { CIniFile& ini = Map->GetIniFile(); @@ -137,7 +137,7 @@ void CInfantrie::Init(CString house, CString strength, CString action, CString d m_flag1 = flag1; - m_flag2 = flag2; + m_group = group; m_flag3 = flag3; m_flag4 = flag4; m_flag5 = flag5; diff --git a/MissionEditor/Infantry.h b/MissionEditor/Infantry.h index 0d5f5ec..61ff5ca 100644 --- a/MissionEditor/Infantry.h +++ b/MissionEditor/Infantry.h @@ -55,7 +55,7 @@ public: CString m_direction; CString m_house; CString m_flag1; - CString m_flag2; + CString m_group; CString m_flag3; CString m_flag4; CString m_action; diff --git a/MissionEditor/IsoView.cpp b/MissionEditor/IsoView.cpp index 7c69238..de64211 100644 --- a/MissionEditor/IsoView.cpp +++ b/MissionEditor/IsoView.cpp @@ -2014,7 +2014,7 @@ void CIsoView::HandleProperties(int n, int type) char tmp[255]; dlg.Init((LPCTSTR)data.house, (LPCTSTR)data.strength, (LPCTSTR)data.action, (LPCTSTR)data.direction, (LPCTSTR)data.tag, (LPCTSTR)data.flag1, - (LPCTSTR)data.flag2, (LPCTSTR)data.flag3, (LPCTSTR)data.flag4, (LPCTSTR)data.flag5); + (LPCTSTR)data.group, (LPCTSTR)data.flag3, (LPCTSTR)data.flag4, (LPCTSTR)data.flag5); int res = dlg.DoModal(); if (res == IDCANCEL) return; @@ -2025,7 +2025,7 @@ void CIsoView::HandleProperties(int n, int type) data.direction = dlg.m_direction; data.house = dlg.m_house; data.flag1 = dlg.m_flag1; - data.flag2 = dlg.m_flag2; + data.group = dlg.m_group; data.flag3 = dlg.m_flag3; data.flag4 = dlg.m_flag4; data.flag5 = dlg.m_flag5; @@ -2091,7 +2091,7 @@ void CIsoView::HandleProperties(int n, int type) CAircraft dlg(this); char tmp[255]; dlg.Init(data.house, data.strength, data.direction, data.action, - data.tag, data.flag1, data.flag2, data.flag3, data.flag4); + data.tag, data.flag1, data.group, data.flag3, data.flag4); int res = dlg.DoModal(); if (res == IDCANCEL) return; @@ -2102,7 +2102,7 @@ void CIsoView::HandleProperties(int n, int type) data.direction = dlg.m_direction; data.house = dlg.m_house; data.flag1 = dlg.m_flag1; - data.flag2 = dlg.m_flag2; + data.group = dlg.m_group; data.flag3 = dlg.m_flag3; data.flag4 = dlg.m_flag4; @@ -2124,7 +2124,7 @@ void CIsoView::HandleProperties(int n, int type) CUnit dlg(this); char tmp[255]; dlg.Init(data.house, data.strength, data.direction, data.action, - data.tag, data.flag1, data.flag2, data.flag3, data.flag4, data.flag5, data.flag6); + data.tag, data.flag1, data.group, data.flag3, data.flag4, data.flag5, data.flag6); int res = dlg.DoModal(); if (res == IDCANCEL) return; @@ -2135,7 +2135,7 @@ void CIsoView::HandleProperties(int n, int type) data.direction = dlg.m_direction; data.house = dlg.m_house; data.flag1 = dlg.m_flag1; - data.flag2 = dlg.m_flag2; + data.group = dlg.m_group; data.flag3 = dlg.m_flag3; data.flag4 = dlg.m_flag4; data.flag5 = dlg.m_flag5; diff --git a/MissionEditor/MapData.cpp b/MissionEditor/MapData.cpp index 0a19155..a4c65dc 100644 --- a/MissionEditor/MapData.cpp +++ b/MissionEditor/MapData.cpp @@ -1460,7 +1460,7 @@ void CMapData::UpdateInfantry(BOOL bSave) id.direction = GetParam(data, 7); id.tag = GetParam(data, 8); id.flag1 = GetParam(data, 9); - id.flag2 = GetParam(data, 10); + id.group = GetParam(data, 10); id.flag3 = GetParam(data, 11); id.flag4 = GetParam(data, 12); id.flag5 = GetParam(data, 13); @@ -1508,7 +1508,7 @@ void CMapData::UpdateInfantry(BOOL bSave) CString value; value = infantry.house + "," + infantry.type + "," + infantry.strength + "," + infantry.y + "," + infantry.x + "," + infantry.pos + "," + infantry.action + "," + infantry.direction + "," + - infantry.tag + "," + infantry.flag1 + "," + infantry.flag2 + "," + infantry.flag3 + "," + + infantry.tag + "," + infantry.flag1 + "," + infantry.group + "," + infantry.flag3 + "," + infantry.flag4 + "," + infantry.flag5; char c[50]; @@ -2174,7 +2174,7 @@ BOOL CMapData::AddInfantry(INFANTRY* lpInfantry, LPCTSTR lpType, LPCTSTR lpHouse infantry.tag = "None"; infantry.direction = "0"; infantry.flag1 = "0"; - infantry.flag2 = "-1"; + infantry.group = "-1"; infantry.flag3 = "0"; infantry.flag4 = "1"; infantry.flag5 = "0"; @@ -2485,7 +2485,7 @@ void CMapData::GetUnitData(DWORD dwIndex, UNIT* lpUnit) const lpUnit->action = GetParam(data, 6); lpUnit->tag = GetParam(data, 7); lpUnit->flag1 = GetParam(data, 8); - lpUnit->flag2 = GetParam(data, 9); + lpUnit->group = GetParam(data, 9); lpUnit->flag3 = GetParam(data, 10); lpUnit->flag4 = GetParam(data, 11); lpUnit->flag5 = GetParam(data, 12); @@ -2510,7 +2510,7 @@ void CMapData::GetAircraftData(DWORD dwIndex, AIRCRAFT* lpAircraft) const lpAircraft->action = GetParam(data, 6); lpAircraft->tag = GetParam(data, 7); lpAircraft->flag1 = GetParam(data, 8); - lpAircraft->flag2 = GetParam(data, 9); + lpAircraft->group = GetParam(data, 9); lpAircraft->flag3 = GetParam(data, 10); lpAircraft->flag4 = GetParam(data, 11); } @@ -2575,7 +2575,7 @@ BOOL CMapData::AddAircraft(AIRCRAFT* lpAircraft, LPCTSTR lpType, LPCTSTR lpHouse aircraft.x = sx; aircraft.y = sy; aircraft.flag1 = "0"; - aircraft.flag2 = "0"; + aircraft.group = "-1"; aircraft.flag3 = "1"; aircraft.flag4 = "0"; } @@ -2589,7 +2589,7 @@ BOOL CMapData::AddAircraft(AIRCRAFT* lpAircraft, LPCTSTR lpType, LPCTSTR lpHouse CString value; value = aircraft.house + "," + aircraft.type + "," + aircraft.strength + "," + aircraft.y + "," + aircraft.x + "," + aircraft.direction + "," + aircraft.action + "," + aircraft.tag + "," - + aircraft.flag1 + "," + aircraft.flag2 + "," + aircraft.flag3 + "," + aircraft.flag4; + + aircraft.flag1 + "," + aircraft.group + "," + aircraft.flag3 + "," + aircraft.flag4; m_mapfile.SetString("Aircraft", id, value); @@ -2620,7 +2620,7 @@ BOOL CMapData::AddUnit(UNIT* lpUnit, LPCTSTR lpType, LPCTSTR lpHouse, DWORD dwPo unit.x = sx; unit.y = sy; unit.flag1 = "0"; - unit.flag2 = "-1"; + unit.group = "-1"; unit.flag3 = "0"; unit.flag4 = "-1"; unit.flag5 = "1"; @@ -2637,7 +2637,7 @@ BOOL CMapData::AddUnit(UNIT* lpUnit, LPCTSTR lpType, LPCTSTR lpHouse, DWORD dwPo CString value; value = unit.house + "," + unit.type + "," + unit.strength + "," + unit.y + "," + unit.x + "," + unit.direction + "," + unit.action + "," + unit.tag + "," - + unit.flag1 + "," + unit.flag2 + "," + unit.flag3 + "," + unit.flag4 + "," + unit.flag5 + "," + unit.flag6; + + unit.flag1 + "," + unit.group + "," + unit.flag3 + "," + unit.flag4 + "," + unit.flag5 + "," + unit.flag6; m_mapfile.SetString("Units", id, value); @@ -6874,7 +6874,7 @@ BOOL CMapData::GetInfantryINIData(int index, CString* lpINI) CString value; value = infantry.house + "," + infantry.type + "," + infantry.strength + "," + infantry.y + "," + infantry.x + "," + infantry.pos + "," + infantry.action + "," + infantry.direction + "," + - infantry.tag + "," + infantry.flag1 + "," + infantry.flag2 + "," + infantry.flag3 + "," + + infantry.tag + "," + infantry.flag1 + "," + infantry.group + "," + infantry.flag3 + "," + infantry.flag4 + "," + infantry.flag5; *lpINI = value; diff --git a/MissionEditor/Structs.h b/MissionEditor/Structs.h index af4c963..9a57143 100644 --- a/MissionEditor/Structs.h +++ b/MissionEditor/Structs.h @@ -467,7 +467,7 @@ struct INFANTRY { CString direction; // 8 CString tag; // 9 CString flag1; // 10 - CString flag2; // 11 + CString group; // 11 CString flag3; // 12 CString flag4; // 13 CString flag5; // 14 @@ -484,7 +484,7 @@ struct UNIT { CString action; // 7 CString tag; // 8 CString flag1; // 9 - CString flag2; // 10 + CString group; // 10 CString flag3; // 11 CString flag4; // 12 CString flag5; // 13 @@ -504,7 +504,7 @@ struct AIRCRAFT { CString action; // 7 CString tag; // 8 CString flag1; // 9 - CString flag2; // 10 + CString group; // 10 CString flag3; // 11 CString flag4; // 12 unsigned deleted : 1; diff --git a/MissionEditor/Unit.cpp b/MissionEditor/Unit.cpp index d91b960..ac9db0b 100644 --- a/MissionEditor/Unit.cpp +++ b/MissionEditor/Unit.cpp @@ -45,7 +45,7 @@ CUnit::CUnit(CWnd* pParent /*=NULL*/) //{{AFX_DATA_INIT(CUnit) m_direction = _T(""); m_flag1 = _T(""); - m_flag2 = _T(""); + m_group = _T(""); m_house = _T(""); m_flag3 = _T(""); m_flag4 = _T(""); @@ -64,7 +64,7 @@ void CUnit::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_STRENGTH, m_strength_ctrl); DDX_CBString(pDX, IDC_DIRECTION, m_direction); DDX_Text(pDX, IDC_P1, m_flag1); - DDX_Text(pDX, IDC_P2, m_flag2); + DDX_Text(pDX, IDC_P2, m_group); DDX_CBString(pDX, IDC_HOUSE, m_house); DDX_Text(pDX, IDC_P3, m_flag3); DDX_Text(pDX, IDC_P4, m_flag4); @@ -84,7 +84,7 @@ END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// // Behandlungsroutinen für Nachrichten CUnit -void CUnit::Init(CString house, CString strength, CString direction, CString action, CString tag, CString flag1, CString flag2, CString flag3, CString flag4, CString flag5, CString flag6) +void CUnit::Init(CString house, CString strength, CString direction, CString action, CString tag, CString flag1, CString group, CString flag3, CString flag4, CString flag5, CString flag6) { CIniFile& ini = Map->GetIniFile(); @@ -99,7 +99,7 @@ void CUnit::Init(CString house, CString strength, CString direction, CString act } m_flag1 = flag1; - m_flag2 = flag2; + m_group = group; m_flag3 = flag3; m_flag4 = flag4; m_flag5 = flag5; diff --git a/MissionEditor/Unit.h b/MissionEditor/Unit.h index f846079..127d867 100644 --- a/MissionEditor/Unit.h +++ b/MissionEditor/Unit.h @@ -55,7 +55,7 @@ public: CSliderCtrl m_strength_ctrl; CString m_direction; CString m_flag1; - CString m_flag2; + CString m_group; CString m_house; CString m_flag3; CString m_flag4; diff --git a/MissionEditor/UserScriptsDlg.cpp b/MissionEditor/UserScriptsDlg.cpp index e0810a6..a05a989 100644 --- a/MissionEditor/UserScriptsDlg.cpp +++ b/MissionEditor/UserScriptsDlg.cpp @@ -2340,7 +2340,7 @@ void CUserScriptsDlg::OnOK() id.direction = GetParam(data, 7); id.tag = GetParam(data, 8); id.flag1 = GetParam(data, 9); - id.flag2 = GetParam(data, 10); + id.group = GetParam(data, 10); id.flag3 = GetParam(data, 11); id.flag4 = GetParam(data, 12); id.flag5 = GetParam(data, 13); @@ -2390,7 +2390,7 @@ void CUserScriptsDlg::OnOK() unit.action = GetParam(data, 6); unit.tag = GetParam(data, 7); unit.flag1 = GetParam(data, 8); - unit.flag2 = GetParam(data, 9); + unit.group = GetParam(data, 9); unit.flag3 = GetParam(data, 10); unit.flag4 = GetParam(data, 11); unit.flag5 = GetParam(data, 12); @@ -2446,7 +2446,7 @@ void CUserScriptsDlg::OnOK() air.action = GetParam(data, 6); air.tag = GetParam(data, 7); air.flag1 = GetParam(data, 8); - air.flag2 = GetParam(data, 9); + air.group = GetParam(data, 9); air.flag3 = GetParam(data, 10); air.flag4 = GetParam(data, 11);