Subversion Repositories spk

Rev

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

Rev 94 Rev 103
Line 31... Line 31...
31 
 
 31 
 
32 
		CyStringList List;
 32 
		CyStringList List;
33 
		int idPos = 23;
 33 
		int idPos = 23;
34 
 
 34 
 
35 
		int mask = 0;
 35 
		int mask = 0;
- 
 
 36 
		int defaultMask = 0;
36 
 
 37 
 
37 
		CGameDirectories *gameDir = ((CustomiseShip ^)m_pParent)->gameDirectories();
 38 
		CGameDirectories *gameDir = ((CustomiseShip ^)m_pParent)->gameDirectories();
38 
 
 39 
 
39 
		if ( this->ComboGameLaser->SelectedIndex > 0 )
 40 
		if ( this->ComboGameLaser->SelectedIndex > 0 )
40 
		{
 41 
		{
Line 63... Line 64...
63 
				mask = m_pShipData->iMissileMask;
 64 
				mask = m_pShipData->iMissileMask;
64 
			else
 65 
			else
65 
				mask = m_pShipData->iLaserMask;
 66 
				mask = m_pShipData->iLaserMask;
66 
		}
 67 
		}
67 
 
 68 
 
- 
 
 69 
		if ( this->RadioMissiles->Checked )
- 
 
 70 
			defaultMask = m_pShipData->iMissileMask;
- 
 
 71 
		else
- 
 
 72 
			defaultMask = m_pShipData->iLaserMask;
- 
 
 73 
 
- 
 
 74 
		if ( defaultMask == -1 ) defaultMask = 0;
68 
		if ( mask == -1 ) mask = 0;
 75 
		if ( mask == -1 ) mask = 0;
69 
 
 76 
 
70 
		if ( this->ComboGameLaser->SelectedIndex > 0 )
 77 
		if ( this->ComboGameLaser->SelectedIndex > 0 ) {
71 
		{
 - 
 
72
- 
 
73 
			gameDir->setSelectedGameDirectory(this->ComboGameLaser->SelectedIndex, true);
 78 
			gameDir->setSelectedGameDirectory(this->ComboGameLaser->SelectedIndex, true);
- 
 
 79 
			if ( gameDir->selectedVFS() )
- 
 
 80 
				((CustomiseShip ^)m_pParent)->LoadText(gameDir->selectedVFS());
- 
 
 81 
		}
- 
 
 82 
 
74 
			if ( !this->RadioMissiles->Checked ) {
 83 
		if ( !this->RadioMissiles->Checked ) {
75 
				for ( std::pair<Utils::String, Utils::String> laser = gameDir->firstLaser(); !laser.first.empty(); laser = gameDir->nextLaser() ) {
 84 
			for ( std::pair<Utils::String, Utils::String> laser = gameDir->firstLaser(); !laser.first.empty(); laser = gameDir->nextLaser() ) {
76 
					_addToList(&List, laser, 6);
 85 
				_addToList(&List, laser, 6);
77 
				}
 86 
			}
78 
			}
 87 
		}
79 
			else {
 88 
		else {
80 
				for ( std::pair<Utils::String, Utils::String> missile = gameDir->firstMissile(); !missile.first.empty(); missile = gameDir->nextMissile() ) {
 89 
			for ( std::pair<Utils::String, Utils::String> missile = gameDir->firstMissile(); !missile.first.empty(); missile = gameDir->nextMissile() ) {
81 
					_addToList(&List, missile, 6);
 90 
				_addToList(&List, missile, 6);
82 
				}
 - 
 
83 
			}
 91 
			}
84 
			gameDir->reselectTemporaryDirectory();
 - 
 
85 
		}
 92 
		}
- 
 
 93 
		if ( this->ComboGameLaser->SelectedIndex > 0 )
- 
 
 94 
			gameDir->reselectTemporaryDirectory();
86 
 
 95 
 
- 
 
 96 
		if ( this->ComboGameLaser->SelectedIndex > 0 && this->CheckWeaponDefault->Checked )
- 
 
 97 
			mask = defaultMask;
- 
 
 98 
 
87 
		for ( int i = 0; i < 32; i++ )
 99 
		for ( int i = 0; i < 32; i++ )
88 
		{
 100 
		{
89 
			if ( List.Count() > i )
 101 
			if ( List.Count() > i )
90 
			{
 102 
			{
91 
				ListViewItem ^item = gcnew ListViewItem(SystemStringFromCyString(List.GetAt(i)->str));
 103 
				ListViewItem ^item = gcnew ListViewItem(SystemStringFromCyString(List.GetAt(i)->str));
Line 100... Line 112...
100 
				}
 112 
				}
101 
				else
 113 
				else
102 
					item->Tag = i;
 114 
					item->Tag = i;
103 
 
 115 
 
104 
				int flag = (1 << Convert::ToInt32(item->Tag));
 116 
				int flag = (1 << Convert::ToInt32(item->Tag));
- 
 
 117 
 
105 
				if ( mask & flag )
 118 
				if ( mask & flag )
106 
					item->Checked = true;
 119 
					item->Checked = true;
107 
				added = true;
 120 
				added = true;
108 
			}
 121 
			}
109 
 
 122