Subversion Repositories spk

Rev

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

Rev 1 Rev 39
Line 408... Line 408...
408 
 
 408 
 
409 
				if ( check == SPKFILE_SINGLESHIP )
 409 
				if ( check == SPKFILE_SINGLESHIP )
410 
					loaded = shipFile->ReadFile(CyStringFromSystemString(open));
 410 
					loaded = shipFile->ReadFile(CyStringFromSystemString(open));
411 
				else if ( check == SPKFILE_INVALID )
 411 
				else if ( check == SPKFILE_INVALID )
412 
				{
 412 
				{
413 
					loaded = shipFile->ConvertOld(CyStringFromSystemString(open));
 413 
					loaded = shipFile->ConvertOld(_S(open));
414 
					if ( loaded )
 414 
					if ( loaded )
415 
						m_bChanged = true;
 415 
						m_bChanged = true;
416 
				}
 416 
				}
417 
 
 417 
 
418 
				this->ComboCockpits->Items->Clear();
 418 
				this->ComboCockpits->Items->Clear();
Line 433... Line 433...
433 
					m_iOldGame = -1;
 433 
					m_iOldGame = -1;
434 
 
 434 
 
435 
					if ( m_pLoadedShip->AnyCockpits() )
 435 
					if ( m_pLoadedShip->AnyCockpits() )
436 
					{
 436 
					{
437 
						for ( SCockpit *c = m_pLoadedShip->GetCockpits()->First(); c; c = m_pLoadedShip->GetCockpits()->Next() )
 437 
						for ( SCockpit *c = m_pLoadedShip->GetCockpits()->First(); c; c = m_pLoadedShip->GetCockpits()->Next() )
438 
							this->ComboCockpits->Items->Add(SystemStringFromCyString(c->sCockpit.GetToken(";", 19, 19)));
 438 
							this->ComboCockpits->Items->Add(_US(c->sCockpit.token(";", 19)));
439 
						this->CockpitWeapons->Show();
 439 
						this->CockpitWeapons->Show();
440 
						this->ComboCockpits->Enabled = true;
 440 
						this->ComboCockpits->Enabled = true;
441 
						//m_pCockpit = m_pLoadedShip->GetCockpits()->First();
 441 
						//m_pCockpit = m_pLoadedShip->GetCockpits()->First();
442 
					}
 442 
					}
443 
					else
 443 
					else
Line 850... Line 850...
850 
			m_pCockpit = m_pLoadedShip->GetCockpits()->Get(this->ComboCockpits->SelectedIndex);
 850 
			m_pCockpit = m_pLoadedShip->GetCockpits()->Get(this->ComboCockpits->SelectedIndex);
851 
 
 851 
 
852 
			int mask = 0;
 852 
			int mask = 0;
853 
			if ( m_pCockpit )
 853 
			if ( m_pCockpit )
854 
			{
 854 
			{
855 
				mask = m_pCockpit->sCockpit.GetToken(";", 9, 9).ToInt();
 855 
				mask = m_pCockpit->sCockpit.token(";", 9);
856 
				for ( SWeaponMask *wm = m_pCockpit->lWeaponMask.First(); wm; wm = m_pCockpit->lWeaponMask.Next() )
 856 
				for ( SWeaponMask *wm = m_pCockpit->lWeaponMask.First(); wm; wm = m_pCockpit->lWeaponMask.Next() )
857 
				{
 857 
				{
858 
					if ( wm->iGame == (this->ComboGame->SelectedIndex + 2) )
 858 
					if ( wm->iGame == (this->ComboGame->SelectedIndex + 2) )
859 
					{
 859 
					{
860 
						mask = wm->iMask;
 860 
						mask = wm->iMask;