Subversion Repositories spk

Rev

Rev 94 | Rev 191 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 94 Rev 170
Line 24... Line 24...
24
		this->ComboGameCockpit->Items->Clear();
24
		this->ComboGameCockpit->Items->Clear();
25
		this->ComboGameCockpit->Items->Add("- Default -");
25
		this->ComboGameCockpit->Items->Add("- Default -");
26
 
26
 
27
		// cockpit combo selection
27
		// cockpit combo selection
28
		this->ComboCockpit->Items->Clear();
28
		this->ComboCockpit->Items->Clear();
29
		if ( !m_pModels || m_pModels->Empty() )
29
		if (!_pModels || _pModels->empty())
30
		{
30
		{
31
			// if no scene file
31
			// if no scene file
32
			if ( m_pShipData->lTurrets.size() )
32
			if ( m_pShipData->lTurrets.size() )
33
			{
33
			{
34
				STurretEntry *t = m_pShipData->lTurrets[0];
34
				STurretEntry *t = m_pShipData->lTurrets[0];
Line 42... Line 42...
42
		// otherwise, fill in the data
42
		// otherwise, fill in the data
43
		else
43
		else
44
		{
44
		{
45
			this->ComboCockpit->Enabled = true;
45
			this->ComboCockpit->Enabled = true;
46
			int i = 0;
46
			int i = 0;
47
			for ( SStringList *str = m_pModels->Head(); str; str = str->next )
47
			for(auto itr = _pModels->begin(); itr != _pModels->end(); itr++)
48
			{
48
			{
49
				String ^entry = SystemStringFromCyString(str->str) + ":" + Convert::ToString(i);
49
				String ^entry = _US((*itr)->str) + ":" + Convert::ToString(i);
50
				this->ComboCockpit->Items->Add(entry);
50
				this->ComboCockpit->Items->Add(entry);
51
				++i;
51
				++i;
52
			}
52
			}
53
		}
53
		}
54
 
54
 
55
		this->UpdateTurrets();
55
		this->UpdateTurrets();
56
	}
56
	}
57
 
57
 
58
	void CustomiseTurret::UpdateDisplay()
58
	void CustomiseTurret::UpdateDisplay()
59
	{
59
	{
60
		if ( m_pModels && !m_pModels->Empty() )
60
		if (_pModels && !_pModels->empty())
61
			this->ComboCockpit->SelectedIndex = m_pShipData->lTurrets.Get(0)->iSceneNode;
61
			this->ComboCockpit->SelectedIndex = m_pShipData->lTurrets.Get(0)->iSceneNode;
62
	}
62
	}
63
 
63
 
64
	void CustomiseTurret::UpdateCockpits()
64
	void CustomiseTurret::UpdateCockpits()
65
	{
65
	{
Line 81... Line 81...
81
		int i = 0;
81
		int i = 0;
82
		for ( STurretEntry *t = m_pShipData->lTurrets.First(); t; t = m_pShipData->lTurrets.Next() )
82
		for ( STurretEntry *t = m_pShipData->lTurrets.First(); t; t = m_pShipData->lTurrets.Next() )
83
		{
83
		{
84
			if ( t == m_pShipData->lTurrets.Front()->Data() ) continue; // skip the first entry (its the cockpit not a turret
84
			if ( t == m_pShipData->lTurrets.Front()->Data() ) continue; // skip the first entry (its the cockpit not a turret
85
			ListViewItem ^item = this->ListTurret->Items->Add(gcnew ListViewItem(Convert::ToString(t->iIndex - 1)));
85
			ListViewItem ^item = this->ListTurret->Items->Add(gcnew ListViewItem(Convert::ToString(t->iIndex - 1)));
86
			if ( m_pShipData->cockpits[t->iTurret - 1].sCockpit.Empty() )
86
			if (m_pShipData->cockpits[t->iTurret - 1].sCockpit.empty())
87
				item->SubItems->Add(Convert::ToString(m_pShipData->cockpits[t->iTurret - 1].iCockpit));
87
				item->SubItems->Add(Convert::ToString(m_pShipData->cockpits[t->iTurret - 1].iCockpit));
88
			else
88
			else
89
				item->SubItems->Add(SystemStringFromCyString(m_pShipData->cockpits[t->iTurret - 1].sCockpit));
89
				item->SubItems->Add(_US(m_pShipData->cockpits[t->iTurret - 1].sCockpit));
90
			item->SubItems->Add(this->GetPosition(m_pShipData->cockpits[t->iTurret - 1].iPos));
90
			item->SubItems->Add(this->GetPosition(m_pShipData->cockpits[t->iTurret - 1].iPos));
91
			item->SubItems->Add(SystemStringFromCyString(t->sModel) + ":" + Convert::ToString(t->iSceneNode));
91
			item->SubItems->Add(_US(t->sModel) + ":" + Convert::ToString(t->iSceneNode));
92
			item->ImageKey = "turret";
92
			item->ImageKey = "turret";
93
			++i;
93
			++i;
94
			item->Tag = i;
94
			item->Tag = i;
95
		}
95
		}
96
		this->ListTurret->AutoResizeColumns(ColumnHeaderAutoResizeStyle::HeaderSize);
96
		this->ListTurret->AutoResizeColumns(ColumnHeaderAutoResizeStyle::HeaderSize);
Line 221... Line 221...
221
			item->SubItems[3]->Text = str;
221
			item->SubItems[3]->Text = str;
222
	}
222
	}
223
	
223
	
224
	String ^CustomiseTurret::EditTurret(int id)
224
	String ^CustomiseTurret::EditTurret(int id)
225
	{
225
	{
226
		if ( !m_pModels ) return nullptr;
226
		if (!_pModels) return nullptr;
227
		 InputBox ^input = gcnew InputBox("Select the model entry to use for the cockpit (Turret: " + Convert::ToString(id) + ")");
227
		 InputBox ^input = gcnew InputBox("Select the model entry to use for the cockpit (Turret: " + Convert::ToString(id) + ")");
228
		 int i = 0;
228
		 int i = 0;
229
		 for ( SStringList *str = m_pModels->Head(); str; str = str->next )
229
		 for(auto itr = _pModels->begin(); itr != _pModels->end(); itr++)
230
		 {
230
		 {
231
			 input->AddItem(SystemStringFromCyString(str->str) + ":" + Convert::ToString(i));
231
			 input->AddItem(_US((*itr)->str) + ":" + Convert::ToString(i));
232
			 ++i;
232
			 ++i;
233
		 }
233
		 }
234
		 input->SetSelectedOption(m_pShipData->lTurrets.Get(id)->iSceneNode);
234
		 input->SetSelectedOption(m_pShipData->lTurrets.Get(id)->iSceneNode);
235
 
235
 
236
		 if ( input->ShowDialog(this) == Windows::Forms::DialogResult::OK )
236
		 if ( input->ShowDialog(this) == Windows::Forms::DialogResult::OK )
237
		 {
237
		 {
238
			 String ^str = input->GetInput();
238
			 String ^str = input->GetInput();
239
			 i = input->GetInputSelected();
239
			 i = input->GetInputSelected();
240
			 m_pShipData->lTurrets.Get(id)->iSceneNode = i;
240
			 m_pShipData->lTurrets.Get(id)->iSceneNode = i;
241
			 m_pShipData->lTurrets.Get(id)->sModel = CyStringFromSystemString(str).GetToken(":", 1, 1);
241
			 m_pShipData->lTurrets.Get(id)->sModel = _S(str).token(":", 1);
242
 
242
 
243
			 return str;
243
			 return str;
244
		 }
244
		 }
245
 
245
 
246
		 return nullptr;
246
		 return nullptr;