Subversion Repositories spk

Rev

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

Rev 213 Rev 216
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(_US(c->sCockpit.token(";", 19)));
 438 
							this->ComboCockpits->Items->Add(_US(c->sCockpit.token(L";", 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 753... Line 753...
753 
				{
 753 
				{
754 
					m_pLoadedShip->SetLaserMask(m_iOldGame, m_iLaserMask);
 754 
					m_pLoadedShip->SetLaserMask(m_iOldGame, m_iLaserMask);
755 
					m_pLoadedShip->SetMissileMask(m_iOldGame, m_iMissileMask);
 755 
					m_pLoadedShip->SetMissileMask(m_iOldGame, m_iMissileMask);
756 
				}
 756 
				}
757 
				if ( m_pCockpit )
 757 
				if ( m_pCockpit )
758 
					m_pLoadedShip->AddCockpit(m_pCockpit->sCockpit, (m_iOldGame == -1) ? (this->ComboGame->SelectedIndex + 2) : m_iOldGame, this->GetMask(this->CockpitWeapons));
 758 
					m_pLoadedShip->addCockpit(m_pCockpit->sCockpit, (m_iOldGame == -1) ? (this->ComboGame->SelectedIndex + 2) : m_iOldGame, this->GetMask(this->CockpitWeapons));
759 
			}
 759 
			}
760 
		}
 760 
		}
761 
 
 761 
 
762 
		void ChangeGame()
 762 
		void ChangeGame()
763 
		{
 763 
		{
Line 840... Line 840...
840 
				return;
 840 
				return;
841 
 
 841 
 
842 
			m_bDontChange = true;
 842 
			m_bDontChange = true;
843
843
844 
			if ( !m_bDontUpdate && m_pCockpit )
 844 
			if ( !m_bDontUpdate && m_pCockpit )
845 
				m_pLoadedShip->AddCockpit(m_pCockpit->sCockpit, (m_iOldGame == -1) ? (this->ComboGame->SelectedIndex + 2) : m_iOldGame, this->GetMask(this->CockpitWeapons));
 845 
				m_pLoadedShip->addCockpit(m_pCockpit->sCockpit, (m_iOldGame == -1) ? (this->ComboGame->SelectedIndex + 2) : m_iOldGame, this->GetMask(this->CockpitWeapons));
846 
 
 846 
 
847 
			m_pCockpit = NULL;
 847 
			m_pCockpit = NULL;
848 
 
 848 
 
849 
			// find the cockpit pointer
 849 
			// find the cockpit pointer
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.token(";", 9);
 855 
				mask = m_pCockpit->sCockpit.token(L";", 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;