Subversion Repositories spk

Rev

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

Rev 191 Rev 197
Line 31... Line 31...
31 
		for ( int i = 1; i <= 19; i++ )
 31 
		for ( int i = 1; i <= 19; i++ )
32 
		{
 32 
		{
33 
			if ( i == 10 ) // special case for player
 33 
			if ( i == 10 ) // special case for player
34 
				this->ComboRace->Items->Add("Player");
 34 
				this->ComboRace->Items->Add("Player");
35 
			else
 35 
			else
36 
				this->ComboRace->Items->Add(_US(game->findText(0, TEXTPAGE_RACE, i, Utils::String::Number(i))));
 36 
				this->ComboRace->Items->Add(_US(game->findText(0, TEXTPAGE_RACE, i, Utils::WString::Number(i))));
37 
		}
 37 
		}
38 
 
 38 
 
39 
		// fill variation entries
 39 
		// fill variation entries
40 
		this->ComboVariation->Items->Clear();
 40 
		this->ComboVariation->Items->Clear();
41 
		this->ComboVariation->Items->Add("Standard");
 41 
		this->ComboVariation->Items->Add("Standard");
42 
		for ( int i = 1; i <= 20; i++ )
 42 
		for ( int i = 1; i <= 20; i++ )
43 
			this->ComboVariation->Items->Add(_US(game->findText(0, TEXTPAGE_OBJECTS, 10000 + i, Utils::String::Number(i))));
 43 
			this->ComboVariation->Items->Add(_US(game->findText(0, TEXTPAGE_OBJECTS, 10000 + i, Utils::WString::Number(i))));
44 
 
 44 
 
45 
		// fill ship class entries
 45 
		// fill ship class entries
46 
		this->ComboClass->Items->Clear();
 46 
		this->ComboClass->Items->Clear();
47 
		for ( int i = 0; i < OBJ_SHIP_MAX; i++ )
 47 
		for ( int i = 0; i < OBJ_SHIP_MAX; i++ )
48 
			this->ComboClass->Items->Add(_US(game->findText(0, TEXTPAGE_CLASS, CShipData::GetShipClassFromNum(i), CShipData::ConvertShipClass(CShipData::GetShipClassFromNum(i)))));
 48 
			this->ComboClass->Items->Add(_US(game->findText(0, TEXTPAGE_CLASS, CShipData::GetShipClassFromNum(i), CShipData::ConvertShipClass(CShipData::GetShipClassFromNum(i)).toWString())));
49 
 
 49 
 
50 
		// the cargo class
 50 
		// the cargo class
51 
		this->ComboCargo->Items->Clear();
 51 
		this->ComboCargo->Items->Clear();
52 
		for ( int i = 0; i < 6; i++ )
 52 
		for ( int i = 0; i < 6; i++ )
53 
		{
 53 
		{
54 
			Utils::String text = game->findText(0, TEXTPAGE_CARGOCLASS, i + 10);
 54 
			Utils::WString text = game->findText(0, TEXTPAGE_CARGOCLASS, i + 10);
55 
			if ( text.empty() )
55 
			if ( text.empty() )
56 
				text = game->findText(0, TEXTPAGE_CARGOCLASS, i, _S(this->GetCargoClass(i)));
 56 
				text = game->findText(0, TEXTPAGE_CARGOCLASS, i, _WS(this->GetCargoClass(i)));
57 
			else
57 
			else
58 
				text = text + " (" + game->findText(0, TEXTPAGE_CARGOCLASS, i, _S(this->GetCargoClass(i))) + ")";
 58 
				text = text + L" (" + game->findText(0, TEXTPAGE_CARGOCLASS, i, _WS(this->GetCargoClass(i))) + L")";
59 
			this->ComboCargo->Items->Add(_US(text));
 59 
			this->ComboCargo->Items->Add(_US(text));
60 
		}
 60 
		}
61 
 
 61 
 
62 
		// the sub type
 62 
		// the sub type
63 
		this->ComboSubType->Items->Clear();
 63 
		this->ComboSubType->Items->Clear();
Line 71... Line 71...
71 
	void CustomiseInfo::UpdateNotority()
 71 
	void CustomiseInfo::UpdateNotority()
72 
	{
 72 
	{
73 
		this->ComboNoto->Items->Clear();
 73 
		this->ComboNoto->Items->Clear();
74 
 
 74 
 
75 
		CGameDirectories *game = ((CustomiseShip ^)m_pParent)->gameDirectories();
 75 
		CGameDirectories *game = ((CustomiseShip ^)m_pParent)->gameDirectories();
76 
		Utils::String text = game->findText(0, this->GetNotoPage(m_pShipData->iRace), 110);
 76 
		Utils::WString text = game->findText(0, this->GetNotoPage(m_pShipData->iRace), 110);
77 
 
 77 
 
78 
		if ( this->GetNotoPage(m_pShipData->iRace) == 0 || text.empty() )
 78 
		if ( this->GetNotoPage(m_pShipData->iRace) == 0 || text.empty() )
79 
			this->ComboNoto->Enabled = false;
 79 
			this->ComboNoto->Enabled = false;
80 
		else
 80 
		else
81 
		{
 81 
		{