Subversion Repositories spk

Rev

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

Rev 170 Rev 191
Line 30... Line 30...
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];
35 
				this->ComboCockpit->Items->Add("No Scene File Loaded!! (" + SystemStringFromCyString(t->sModel) + ":" + Convert::ToString(t->iTurret) + ")");
 35 
				this->ComboCockpit->Items->Add("No Scene File Loaded!! (" + _US(t->sModel) + ":" + Convert::ToString(t->iTurret) + ")");
36 
			}
 36 
			}
37 
			else
 37 
			else
38 
				this->ComboCockpit->Items->Add("No Scene File Loaded!!");
 38 
				this->ComboCockpit->Items->Add("No Scene File Loaded!!");
39 
			this->ComboCockpit->Enabled = false;
 39 
			this->ComboCockpit->Enabled = false;
40 
			this->ComboCockpit->SelectedIndex = 0;
 40 
			this->ComboCockpit->SelectedIndex = 0;
Line 128... Line 128...
128 
	void CustomiseTurret::UpdateCockpitDisplay2()
 128 
	void CustomiseTurret::UpdateCockpitDisplay2()
129 
	{
 129 
	{
130 
		m_pCurrentCockpit = m_pShipFile->FindCockpit(_S(ComboCockpitCustom->Text));
 130 
		m_pCurrentCockpit = m_pShipFile->FindCockpit(_S(ComboCockpitCustom->Text));
131 
		if ( m_pCurrentCockpit )
 131 
		if ( m_pCurrentCockpit )
132 
		{
 132 
		{
133 
			this->TextCockpitScene->Text = SystemStringFromCyString(m_pCurrentCockpit->sCockpit.token(";", 8));
 133 
			this->TextCockpitScene->Text = _US(m_pCurrentCockpit->sCockpit.token(";", 8));
134 
			this->UpdateCockpitWeaponsList();
 134 
			this->UpdateCockpitWeaponsList();
135 
		}
 135 
		}
136 
	}
 136 
	}
137 
	void CustomiseTurret::UpdateCockpitWeaponsList()
 137 
	void CustomiseTurret::UpdateCockpitWeaponsList()
138 
	{
 138 
	{
Line 188... Line 188...
188 
 
 188 
 
189 
		for ( int i = 0; i < 32; i++ )
 189 
		for ( int i = 0; i < 32; i++ )
190 
		{
 190 
		{
191 
			if ( List.Count() > i )
 191 
			if ( List.Count() > i )
192 
			{
 192 
			{
193 
				ListViewItem ^item = gcnew ListViewItem(SystemStringFromCyString(List.GetAt(i)->str));
 193 
				ListViewItem ^item = gcnew ListViewItem(_US(List.GetAt(i)->str.ToString()));
194 
				item->SubItems->Add(SystemStringFromCyString(List.GetAt(i)->data));
 194 
				item->SubItems->Add(_US(List.GetAt(i)->data.ToString()));
195 
				this->ListWeaponCockpit->Items->Add(item);
 195 
				this->ListWeaponCockpit->Items->Add(item);
196 
				item->Tag = i;
 196 
				item->Tag = i;
197 
				if ( mask & (1 << i) )
 197 
				if ( mask & (1 << i) )
198 
					item->Checked = true;
 198 
					item->Checked = true;
199 
				added = true;
 199 
				added = true;