WebSVN – spk – Diff – //libspk/src/XspFile.cpp



Utils::String CXspFile::GetX3ShipData()
{
	Utils::String data = m_sData;
 
	// change the ship subtype, Reunion uses number, TC uses a define
	Utils::WString sSubType = data.token(";", 6);
	if ( !((long)sSubType) && sSubType != L"0" )
		data = data.replaceToken(";", 6, (long)CShipData::ConvertShipSubType(sSubType));
 
	Utils::String sClass = data.token(";", TSHIPPOS_CLASS);
	if ( !((long)sClass) && sClass != "0" )
	{
		int num = 0;
		for ( int i = 0; i < OBJ_SHIP_MAX; i++ )
		{
			if ( sClass.Compare(CShipData::ConvertShipClass(CShipData::GetShipClassFromNum(i)).toString()) )
			{
				num = i;
				break;
			}
		}

 
Utils::String CXspFile::GetTCShipData()
{
	Utils::String data = m_sData;
 
	Utils::WString sSubType = data.token(";", 6);
	if ( ((long)sSubType) || sSubType == L"0" )
		data = data.replaceToken(";", 6, CShipData::ConvertShipSubType((long)sSubType).toString());
 
	Utils::String sClass = data.token(";", TSHIPPOS_CLASS);
	if ( ((long)sClass) || sClass == "0" )
		data = data.replaceToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass((long)sClass).toString());
 
	return data;
}
 
bool CXspFile::removeCockpit(const Utils::String &sCockpitId)

Subversion Repositories spk

(root)//libspk/src/XspFile.cpp – Rev 210 → 211

Rev 210		Rev 211
Line 1111...		Line 1111...
1111	`Utils::String CXspFile::GetX3ShipData()`	1111	`Utils::String CXspFile::GetX3ShipData()`
1112	`{`	1112	`{`
1113	`Utils::String data = m_sData;`	1113	`Utils::String data = m_sData;`
1114		1114
1115	`// change the ship subtype, Reunion uses number, TC uses a define`	1115	`// change the ship subtype, Reunion uses number, TC uses a define`
1116	`Utils::String sSubType = data.token(";", 6);`	1116	`Utils::WString sSubType = data.token(";", 6);`
1117	`if ( !((long)sSubType) && sSubType != "0" )`	1117	`if ( !((long)sSubType) && sSubType != L"0" )`
1118	`data = data.replaceToken(";", 6, (long)CShipData::ConvertShipSubType(sSubType));`	1118	`data = data.replaceToken(";", 6, (long)CShipData::ConvertShipSubType(sSubType));`
1119		1119
1120	`Utils::String sClass = data.token(";", TSHIPPOS_CLASS);`	1120	`Utils::String sClass = data.token(";", TSHIPPOS_CLASS);`
1121	`if ( !((long)sClass) && sClass != "0" )`	1121	`if ( !((long)sClass) && sClass != "0" )`
1122	`{`	1122	`{`
1123	`int num = 0;`	1123	`int num = 0;`
1124	`for ( int i = 0; i < OBJ_SHIP_MAX; i++ )`	1124	`for ( int i = 0; i < OBJ_SHIP_MAX; i++ )`
1125	`{`	1125	`{`
1126	`if ( sClass.Compare(CShipData::ConvertShipClass(CShipData::GetShipClassFromNum(i))) )`	1126	`if ( sClass.Compare(CShipData::ConvertShipClass(CShipData::GetShipClassFromNum(i)).toString()) )`
1127	`{`	1127	`{`
1128	`num = i;`	1128	`num = i;`
1129	`break;`	1129	`break;`
1130	`}`	1130	`}`
1131	`}`	1131	`}`
Line 1138...		Line 1138...
1138		1138
1139	`Utils::String CXspFile::GetTCShipData()`	1139	`Utils::String CXspFile::GetTCShipData()`
1140	`{`	1140	`{`
1141	`Utils::String data = m_sData;`	1141	`Utils::String data = m_sData;`
1142		1142
1143	`Utils::String sSubType = data.token(";", 6);`	1143	`Utils::WString sSubType = data.token(";", 6);`
1144	`if ( ((long)sSubType) \|\| sSubType == "0" )`	1144	`if ( ((long)sSubType) \|\| sSubType == L"0" )`
1145	`data = data.replaceToken(";", 6, CShipData::ConvertShipSubType((long)sSubType));`	1145	`data = data.replaceToken(";", 6, CShipData::ConvertShipSubType((long)sSubType).toString());`
1146		1146
1147	`Utils::String sClass = data.token(";", TSHIPPOS_CLASS);`	1147	`Utils::String sClass = data.token(";", TSHIPPOS_CLASS);`
1148	`if ( ((long)sClass) \|\| sClass == "0" )`	1148	`if ( ((long)sClass) \|\| sClass == "0" )`
1149	`data = data.replaceToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass((long)sClass));`	1149	`data = data.replaceToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass((long)sClass).toString());`
1150		1150
1151	`return data;`	1151	`return data;`
1152	`}`	1152	`}`
1153		1153
1154	`bool CXspFile::removeCockpit(const Utils::String &sCockpitId)`	1154	`bool CXspFile::removeCockpit(const Utils::String &sCockpitId)`