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



	m_iOrgDesc = 0;
 
	m_iShipyard = SHIPYARD_NONE;
}
 
void CXspFile::addText(int id, const Utils::WString &name, const Utils::WString &desc)
{
	// first check if theres an existing id
	SText *newtext = NULL;
	for ( SText *t = m_lText.First(); t; t = m_lText.Next() )
	{

			return;
		}
	}
}
 
void CXspFile::addDummy(const Utils::WString &section, const Utils::WString &data)
{
	SDummy *d = new SDummy;
	d->sData = data;
	d->sSection = section;
 
	if ( d->sData.right(1) != L";" )
		d->sData += L";";
 
	m_lDummy.push_back ( d );
 
	_changed();
}
 
void CXspFile::addComponent(const Utils::WString &;section, const Utils::WString &section2, const Utils::WString &data)
{
	SComponent *c = new SComponent;
	c->sData = data;
	c->sSection = section;
	c->sSection2 = section2;
 
	if ( c->sData.right(1) != L";" )
		c->sData += L";";
 
	m_lComponent.push_back ( c );
 
	_changed();
}

			values += (long)wNode->Data()->iGame;
			values += L":";
			values += (long)wNode->Data()->iMask;
		}
		values += L" ";
		values += cockpit->sCockpit + L"\n";
	}
 
	for ( CListNode<SText> *tNode = m_lText.Front(); tNode; tNode = tNode->next() )
		values += Utils::WString(L"Text: ") + (long)tNode->Data()->iId + L"|" + tNode->Data()->sName.findReplace(L"|", L"<::PiPe::>") + L"|" + tNode->Data()->sDesc + L"\n";
 
	for ( CListNode<SComponent> *cNode = m_lComponent.Front(); cNode; cNode = cNode->next() )
		values += L"Component: " + cNode->Data()->sData.findReplace(L"|", L"<::PiPe::>") + L"|" + cNode->Data()->sSection.findReplace(L"|", L";<::PiPe::>") + L"|" + cNode->Data()->sSection2 + L"\n";
 
	for ( CListNode<SDummy> *dNode = m_lDummy.Front(); dNode; dNode = dNode->next() )
		values += L"Dummy: " + dNode->Data()->sData.findReplace(L"|", L"<::PiPe::>") + L"|" + dNode->Data()->sSection + L"\n";
 
	for ( CListNode<SWeaponMask> *wNode = m_lWeaponMasks.Front(); wNode; wNode = wNode->next() )
		values += Utils::WString(L"WeaponMask: ") + (long)wNode->Data()->iGame + L" " + (long)wNode->Data()->iMask + L"\n";
	for ( CListNode<SWeaponMask> *mNode = m_lMissileMasks.Front(); mNode; mNode = mNode->next() )
		values += Utils::WString(L"MissileMask: ") + (long)mNode->Data()->iGame + L" " + (long)mNode->Data()->iMask + L"\n";
	for (auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)
		values += L"CutData: " + (*itr)->str + L"\n";
	for (auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)
		values += L"Bodies: " + (*itr)->str + L"\n";
	for (auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)
		values += L"Animations: " + (*itr)->str + L"\n";
 
	return values;
}
 
bool CXspFile::parseValueLine(const Utils::WString &sLine)

	else if ( first.Compare(L"OrgDesc") || first.Compare(L"OriginalDesc") )
		m_iOrgDesc = rest;
	else if ( first.Compare(L"Shipyard") )
		m_iShipyard = rest;
	else if ( first.Compare(L"CutData") )
		this->addCutData(rest);
	else if ( first.Compare(L"Bodies") )
		this->addBodies(rest);
	else if ( first.Compare(L"Animations") )
		this->addAnimation(rest);
	else if ( first.Compare(L"Cockpit") )
		this->addCockpit(rest, 0);
	else if ( first.Compare(L"CockpitNew") )
	{
		Utils::WString cockpit = rest.tokens(L" ", 2);
		Utils::WString sMasks = rest.token(L" ", 1);
		this->addCockpit(cockpit, 0, -1);
		int num = sMasks.token(L":", 1);
		for ( int i = 0; i < num; i++ )
		{
			int mask = sMasks.token(L":", ((i + 1) * 2) + 1);
			int game = sMasks.token(L":", ((i + 1) * 2));
			this->addCockpit(cockpit, game, mask);
		}
	}
	else if ( first == L"Web" )	this->setWebSite(rest);
	else if ( first.Compare(L"WeaponMask") )
		this->AddWeaponMask(rest.token(L" ", 1), rest.token(L" ", 2));

		this->AddMissileMask(rest.token(L" ", 1), rest.token(L" ", 2));
	else if ( first == L"Text" )
	{
		SText *text = new SText;
		text->iId = rest.token(L"|", 1);
		text->sName = rest.token(L"|", 2);
		text->sName = text->sName.findReplace(L"<::PiPe::>", L"|");
		text->sDesc = rest.tokens(L"|", 3);
		m_lText.push_back ( text );
	}
	else if ( first == L"Component" )
	{
		SComponent *c = new SComponent;
		c->sData = rest.token(L"|", 1);
		c->sData = c->sData.findReplace (L"<::PiPe::>", L"|");
		c->sSection = rest.token(L"|", 2);
		c->sSection = c->sSection.findReplace (L"<::PiPe::>", L"|");
		c->sSection2 = rest.tokens(L"|", 3);
		m_lComponent.push_back ( c );
	}
	else if ( first == L"Dummy" )
	{
		SDummy *d = new SDummy;
		d->sData = rest.token(L"|", 1);
		d->sData = d->sData.findReplace (L"<::PiPe::>", L"|");
		d->sSection = rest.tokens(L"|", 2);
		m_lDummy.push_back ( d );
	}
	else if ( first == L"Comment" )	this->setDescription(rest.findReplace(L"<newline>", L"<br>"));
	else
		return CBaseFile::parseValueLine(sLine);

	{
		for ( SText *text = m_lText.First(); text; text = m_lText.Next() )
		{
			if ( text->iId == lang )
			{
				name = text->sName;
				break;
			}
		}
	}
 

			newFile->ReadFromData((char *)(compr + pos), rest.word(2));
 
			start += (newFile->GetDataSize() + 1);
		}
		else if ( first.Compare("Text") )
			this->addText(rest.token(":", 1), rest.token(":", 2), rest.tokens(":", 3));
		else if ( first.Compare("Component") )
			this->addComponent(rest.token(";", 1), rest.token(";", 2), rest.tokens(";", 3));
		else if ( first.Compare("Dummy") )
		{
			SDummy *d = new SDummy;
			d->sData = rest.tokens(";", 2).toWString();
			d->sSection = rest.token(";", 1).toWString();
			m_lDummy.push_back ( d );
		}
		else if ( !this->parseValueLine(line) )
		{
		//	printf ( "Command: %s, Rest: %s\n", first.c_str(), rest.c_str());

}
 
 
int GetMaxShipyards() { return (int)SHIPYARD_MAX; }
 
Utils::WString GetShipyardName (int s)
{
	switch (s)
	{
		case SHIPYARD_ARGON:
			return L"Argon";
		case SHIPYARD_BORON:
			return L"Boron";
		case SHIPYARD_PARANID:
			return L"Paranid";
		case SHIPYARD_SPLIT:
			return L"Split";
		case SHIPYARD_TELADI:
			return L"Teladi";
		case SHIPYARD_PIRATES:
			return L"Pirates";
		case SHIPYARD_FRIEND:
			return L"Friendly";
		case SHIPYARD_XENON:
			return L"Xenon";
		case SHIPYARD_TERRAN:
			return L"Terran";
	}
 
	return L"Unknown";
}
 
bool CXspFile::writeHeader(CFileIO &file, int valueheader, int valueComprLen) const
{
	return file.write("XSPCycrow;%.2f;%d;%d\n", FILEVERSION, valueheader, valueComprLen);

	{
		list->pushBack(L"# Shipyards, Set which shipyards to add ships for sale to");
		for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )
		{
			if ( this->IsShipyard(i) )
				list->pushBack(L"Shipyard: " + GetShipyardName(i));
		}
		list->pushBack(L"");
	}
 
	if ( m_iOrgDesc > 0 )

	}
 
	if ( m_lText.size() ) {
		list->pushBack(L"# Ship Texts, the name/description of the ship in each language: <LANGID> <NAME>|<DESCRIPTION>");
		for(CListNode<SText> *node = m_lText.Front(); node; node = node->next()) {
			list->pushBack(Utils::WString(L"ShipText: ") + (long)node->Data()->iId + L" " + node->Data()->sName + L"|" + node-&gt;Data()->sDesc);
		}
 
		list->pushBack(L"");
	}
 

	}
 
	if ( this->m_lComponent.size() ) {
		list->pushBack(L"# Ship Components, each component used in the ships scene: <SECTION> <MODELENTRY> <VALUES>");
		for(CListNode<SComponent> *node = m_lComponent.Front(); node; node = node->next()) {
			list->pushBack(Utils::WString(L"Component: ") + node->Data()->sSection + L" " + node->Data()->sSection2 + L&quot; " + node->;Data()->sData);
		}
		list->pushBack(L"");
	}
 
	if ( this->m_lDummy.size() ) {
		list->pushBack(L"# Ship Dummies, each dummy entry used in the ships scene: <SECTION> <VALUE>");
		for(CListNode<SDummy> *node = m_lDummy.Front(); node; node = node->next()) {
			list->pushBack(L"Dummy: " + node->Data()->sSection + L"; " + node-&gt;Data()->sData);
		}
		list->pushBack(L"");
	}
 
	if ( this->m_lCockpit.size() ) {
		list->pushBack(L"# Cockpit entries, each cockpit value with thier weapons mask");
		for(CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next()) {
			list->pushBack(L"Cockpit: " + node->Data()->sCockpit.token(L";", 19) + L" " + node-&gt;Data()->sCockpit);
			for(SWeaponMask *mask = node->Data()->lWeaponMask.First(); mask; mask = node->Data()->lWeaponMask.Next()) {
				list->pushBack(L"CockpitWeapon: " + node->Data()->sCockpit.token(L";", 19) + L" " + (long)mask->iGame + L" " + (long)mask->iMask);
			}
		}
 
		list->pushBack(L"");
	}
 
	if (!this->_lCutData.empty())
	{
		list->pushBack(L"# Ship Cut Data");
		for(auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)
			list->pushBack(L"CutData: " + (*itr)->str);
		list->pushBack(L"");
	}
 
	if (!this->_lBodies.empty())
	{
		list->pushBack(L"# Ship Bodies");
		for(auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)
			list->pushBack(L"Bodies: " + (*itr)->str);
		list->pushBack(L"");
	}
 
	if (!this->_lAnimations.empty())
	{
		list->pushBack(L"# Ship Animations");
		for (auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)
			list->pushBack(L"Animation: " + (*itr)->str);	
		list->pushBack(L"");
	}
 
	if ( !datafile )
	{

	}
 
	return true;
}
 
void CXspFile::_addSection(Utils::CList<STypesSection> &list, const Utils::WString &section, const Utils::WString &data)
{
	STypesSection *currentSubSection = NULL;
	for(Utils::CList<STypesSection>::iterator itr = list.begin(); itr != list.end(); itr++) {
		if ( (*itr)->sSection.Compare(section) ) {
			currentSubSection = *itr;

		currentSubSection = new STypesSection;
		currentSubSection->sSection = section;
		list.push_back(currentSubSection);
	}
 
	currentSubSection->lEntries.pushBack(data, L"");
}
 
void CXspFile::_addDataSection(Utils::WStringList& list, Utils::CList<STypesSection>& sectionList, bool bUseFirst)
{
	for(auto itr = list.begin(); itr != list.end(); itr++)
	{
		if (bUseFirst) {
			Utils::WString data = (*itr)->str;
			_addSection(sectionList, data.token(L";", 1), data.tokens(L";", 2));
		}
		else {
			_addSection(sectionList, (*itr)->str, (*itr)->data);
		}
	}

}
 
 
void CXspFile::addGeneratedFiles(HZIP &hz)
{
 
 
	CFileIO tmpFile(CPackages::tempDirectory() + L"/temp.tmp");
 
	for(int i = 0; i < 5; i++) {
		Utils::WString type;
		Utils::WString data;
		switch(i) {
			case 0:
				data = L"50;1\r\n" + this->m_sData.toWString();
				type = L"TShips";
				break;
			case 1:
				if ( !this->m_lCockpit.empty() ) {
					data = Utils::WString("51;") + (long)this->m_lCockpit.size() + L";\r\n";
					for(CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next()) {
						data += node->Data()->sCockpit + L"\r\n";
					}
					type = L"TCockpits";
				}
				break;
			case 2:
				if ( !this->m_lComponent.empty() ) {
					type = L"Components";
					CLinkList<SComponentEntry> componentList;
					this->addComponentsToList(componentList);
					for(CListNode<SComponentEntry> *node = componentList.Front(); node; node = node->next()) {
						data += node->Data()->sSection + L"; " + (long)node->Data()->lEntries.size() + L";\r\n";
						data += CXspFile::TypesListToString(node->Data()->lEntries, true);
					}
				}
				break;
			case 3:
				GENERATESECTION(L"Dummies", SDummy, this->m_lDummy);
				break;
			case 4:
				GENERATESTRINGSECTION(L"Bodies", this->_lBodies, true);
				break;
		}
 
		if ( type.empty() ) continue;
 
		Utils::WString fname = L"GENERATED/types/" + type + L".txt";
		
		Utils::WString fileData = L"// Exported " + type + L" file, Generated by SPK Libraries V" + Utils::WString::FromFloat(GetLibraryVersion(), 2) + L"\r\n" + data;
		/*
		if ( tmpFile.startWrite() ) {
			tmpFile.write(fileData.c_str(), fileData.length());
			tmpFile.close();
		}
 
		// tships files
		wsprintf(buf, L"%hs", fname.c_str());
 
		if ( tmpFile.startRead() ) {
			*/
		ZipAdd(hz, fname.c_str(), (void *)fileData.c_str(), fileData.length() * sizeof(wchar_t));
 
		//}
	}
}
 
bool CXspFile::loadPackageData(const Utils::WString &sFirst, const Utils::WString &sRest, const Utils::WString &sMainGame, Utils::WStringList &otherGames, Utils::WStringList &gameAddons, CProgressInfo *progress)
{

	else if ( sFirst.Compare(L"ExistingShip") )
		m_bExistingShip = true;
	else if ( sFirst.Compare(L"ShipID") )
		m_sID = sRest.toString();
	else if ( sFirst.Compare(L"ShipText") )
		this->addText(sRest.token(L" ", 1).toLong(), sRest.tokens(L" ", 2).token(L"|", 1), sRest.tokens(L" ", 2).tokens(L"|", 2));
	else if ( sFirst.Compare(L"Component") )
		this->addComponent(sRest.token(L" ", 1), sRest.token(L" ", 2), sRest.tokens(L" ", 3));
	else if ( sFirst.Compare(L"Cockpit") )
		this->addCockpit(sRest.tokens(L" ", 2).replaceToken(L";", 19, sRest.token(L" ", 1)), 0);
	else if ( sFirst.Compare(L"CockpitWeapon") )
		this->addCockpitWeapon(sRest.token(L" ", 1), sRest.token(L" ", 2), sRest.token(L" ", 3));
	else if ( sFirst.Compare(L"WeaponMask") )
		this->AddWeaponMask(sRest.token(L" ", 1), sRest.token(L" ", 2));
	else if ( sFirst.Compare(L"MissileMask") )
		this->AddMissileMask(sRest.token(L" ", 1), sRest.token(L" ", 2));
	else if ( sFirst.Compare(L"Dummy") )
		this->addDummy(sRest.token(L" ", 1), sRest.token(L" ", 2));
	else if ( sFirst.Compare(L"CutData") )
		this->addCutData(sRest);
	else if ( sFirst.Compare(L"Animation") )
		this->addAnimation(sRest);
	else if ( sFirst.Compare(L"Bodies") )
		this->addBodies(sRest);
	else if ( !CBaseFile::loadPackageData(sFirst, sRest, sMainGame, otherGames, gameAddons, progress) )
	{
		return false;
	}
 
	return true;
}

		data = data.replaceToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass((long)sClass).toString());
 
	return data;
}
 
bool CXspFile::removeCockpit(const Utils::WString &sCockpitId)
{
	Utils::WString cockpitid = sCockpitId;
	// if its a whole line, just get the end
	if ( cockpitid.contains(L";") )
	{
		cockpitid = cockpitid.tokens(L";", -2);
		while ( cockpitid.right(1) == L";" )
			cockpitid.truncate(-1);
	}
 
	bool ret = false;
	for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )
	{
		Utils::WString id = node->Data()->sCockpit.token(L";", 19);
		if ( id.Compare(cockpitid) )
		{
			node->DeleteData();
			ret = true;
			break;

	m_lCockpit.RemoveEmpty();
 
	return ret;
}
 
bool CXspFile::removeComponent(const Utils::WString &section1, const Utils::WString &section2, const Utils::WString &data)
{
	bool ret = false;
	for ( CListNode<SComponent> *node = m_lComponent.Front(); node; node = node->next() )
	{
		if ( node->Data()->sSection.Compare(section1) && node->Data()->sSection2.Compare(section2) && node->Data()->sData.Compare(data) )
		{
			ret = true;
			node->DeleteData();
			break;
		}
	}
	m_lComponent.RemoveEmpty();
	return ret;
}
 
bool CXspFile::removeDummy(const Utils::WString &section, const Utils::WString &data)
{
	bool ret = false;
	for ( CListNode<SDummy> *node = m_lDummy.Front(); node; node = node->next() )
	{
		if ( node->Data()->sSection.Compare(section) && node->Data()->sData.Compare(data) )

 
Utils::String CXspFile::GetCockpitData(const Utils::String &cid)
{
	for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )
	{
		Utils::WString id = node->Data()->sCockpit.token(L";", 19);
		if ( id.Compare(cid) )
			return node->Data()->sCockpit.toString();
	}
 
	return "";
}
 
SCockpit *CXspFile::FindCockpit(const Utils::String &cid)
{
	for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )
	{
		Utils::WString id = node->Data()->sCockpit.token(L";", 19);
		if ( id.Compare(cid) )
			return node->Data();
	}
 
	return NULL;

 
void CXspFile::EditCockpit(const Utils::String &cid, const Utils::String &cockpit)
{
	for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )
	{
		Utils::WString id = node->Data()->sCockpit.token(L";", 19);
		if ( id.Compare(cid) )
		{
			node->Data()->sCockpit = cockpit.toWString();
			break;
		}
	}
}
 
void CXspFile::EditCockpit(const Utils::String &cid, const Utils::String &scene, int mask)
{
	for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )
	{
		Utils::WString id = node->Data()->sCockpit.token(L";", 19);
		if ( id.Compare(cid) )
		{
			Utils::WString cockpit = node->Data()->sCockpit;
			cockpit = cockpit.replaceToken(L";", 8, scene);
			cockpit = cockpit.replaceToken(L";", 9, (long)mask);
			node->Data()->sCockpit = cockpit;
			break;
		}
	}
}
void CXspFile::NewCockpit(const Utils::String &id, const Utils::String &scene, int mask)
{
	Utils::WString cockpit = L"0;0;0;0;0;0;0;";
	cockpit += scene.toWString() + L";";
	cockpit += (long)mask;
	cockpit += L";0;0;0;0;0;0;-100000;0;0;";
	cockpit += id.toWString() + L";";
	this->addCockpit(cockpit, -1);
}
 
bool CXspFile::removeCutData(const Utils::WString &cut)
{
	bool ret = false;
	for(size_t i = 0; i < _lCutData.size(); i++)
	{
		Utils::WString str = _lCutData[i]->str;
		if (str.token(L";", 1).Compare(cut.token(L";", 1)))
		{
			ret = true;
			_lCutData.remove(str);
			break;
		}
	}
 
	return ret;
}
 
bool CXspFile::removeBodies(const Utils::WString &cut)
{
	bool ret = false;
	for (auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)
	{
		if ((*itr)->str.remove(' ').Compare(cut.remove(' ')))

	}
 
	return false;
}
 
bool CXspFile::removeAnimation(const Utils::WString &cut)
{
	for(auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)
	{
		if ((*itr)->str.remove(' ').remove('\n').Compare(cut.remove(' ').remove('\n')))
		{

	}
 
	return false;
}
 
SCockpit *CXspFile::_findCockpit(const Utils::WString &sID)
{
	for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() ) {
		Utils::WString id = node->Data()->sCockpit.token(L";", 19);
		if ( id.Compare(sID) )
			return node->Data();
	}
 
	return NULL;
}
 
void CXspFile::addCockpitWeapon(const Utils::WString &cockpit, int game, int mask)
{
	SCockpit *pCockpit = _findCockpit(cockpit);
 
	// search if the game mask already exists
	SWeaponMask *wm = NULL;

		pCockpit->lWeaponMask.push_back(wm);
	}
 
	wm->iGame = game;
	if ( mask == -1 )
		wm->iMask = pCockpit->sCockpit.token(L";", 9);
	else
		wm->iMask = mask;
	_changed();
}
 
void CXspFile::addCockpit(const Utils::WString &cockpit, int game, int mask, int index)
{
	Utils::WString cid = cockpit.token(L";", 19);
	SCockpit *pCockpit = _findCockpit(cid);
 
	if ( !pCockpit )
	{
		pCockpit = new SCockpit;

	if ( index != -1 )
		pCockpit->iIndex = index;
 
	// now add the game mask
	if ( game > 0 )
		addCockpitWeapon(cid, game, mask);
	_changed();
}
 
void CXspFile::addBody(const Utils::WString &section, const Utils::WString &data)
{
	this->addBodies(section + L";" + data);
	_changed();
}
void CXspFile::addBodies(const Utils::WString &sData)
{
	Utils::WString data = sData;
	if ( !data.isNumber() )
	{
		if ( data[(int)(data.length() - 5)] == '.' )
			data = data.left(-5);
		else if ( data[(int)(data.length() - 4)] == '.' )
			data = data.left(-4);
		if ( data.right(1) != L";" )
			data += L";";
	}
	if(!_lBodies.contains(data))
		_lBodies.pushBack(data);
	_changed();
}
 
void CXspFile::addCutData(const Utils::WString& data)
{ 
	if (!_lCutData.contains(data))
	{
		_lCutData.pushBack(data);
		_changed();

		return TAT_3;
 
	return TAT_NONE;
}
 
Utils::WString CXspFile::TypesListToString(Utils::CList<STypesSection> &list, bool deleteAfter)
{
	Utils::WString data;
 
	for(Utils::CList<STypesSection>::iterator itr = list.begin(); itr != list.end(); itr++) {
		data += (*itr)->sSection + L"; " + (long)(*itr)->lEntries.size() + L";\r\n";
		for(Utils::WStringNode *str = (*itr)->lEntries.first(); str; str = (*itr)->lEntries.next()) {
			data += str->str + L"\r\n";
		}
 
		if ( deleteAfter ) {
			(*itr)->lEntries.clear();
		}

	for(auto itr = list.begin(); itr != list.end(); itr++)
		this->addAnimation((*itr)->str);
	_changed();
}
 
void CXspFile::addAnimation(const Utils::WString& data) 
{ 
	if (!_lAnimations.contains(data))
	{
		_lAnimations.pushBack(data);
		_changed();

void CXspFile::extractCutData(CVirtualFileSystem *pVfs, Utils::CStringList &sceneModels, bool add)
{
	std::vector<int> cuts;
	for ( CListNode<SDummy> *node = m_lDummy.Front(); node; node = node->next() )
	{
		Utils::WString data = node->Data()->sData;
		int states = data.token(L";", 3);
		for ( int i = 0; i < states; i++ ) {
			int cutid = data.token(L";", (i * 2) + 5);
			if ( !cutid ) continue;
			cuts.push_back(cutid);
		}
	}
 

					else
					{
						Utils::String first = str.token(";", 1);
						if (sceneModels.contains(first))
						{
							this->addDummy(section, str);
 
							if (add)
							{
								int pos = 4;
								int scene = str.token(";", 3).toInt();

 
					// not in a section yet
					if (secCount2)
					{
						if (sceneModels.contains(file))
							this->addComponent(section, file, str);
						--secCount2;
					}
					else if (secCount <= 0)
					{
						section = str.token(";", 1);

			for (int i = 0; i < 6; i++)
			{
				int idx = m_sData.token(";", 32 + (i * 2));
				if (static_cast<size_t>(idx) < lines.size() && idx)
				{
					Utils::WString turret = lines[idx];
					int pos = -1;
					Utils::WString id;
					while (id.empty() && pos > -100) id = turret.token(L";", pos--);
					m_sData = m_sData.replaceToken(";", 32 + (i * 2), id.toString() + "(" + (long)idx + ")");
 
					this->addCockpit(turret, 0);
				}
			}
		}
		return true;
	}

		if ( lang == 44 || this->name().empty())
		{
			this->setName(shipName);
			this->setDescription(shipDesc.findReplace("&amp", "&"));
		}
		this->addText(lang, shipName, shipDesc);
		return true;	
	}
 
	return false;
}

	{
		SCockpit *c = node->Data();
		if ( c->iIndex < 0 )
			continue;
 
		Utils::WString id = c->sCockpit.token(L";", 19);
 
		for ( int i = 0; i < 6; i++ )
		{
			Utils::String tId = m_sData.token(";", 32 + (i * 2));
			if ( tId.isNumber() && ((int)tId) == c->iIndex )
				m_sData = m_sData.replaceToken(";", 32 + (i * 2), id.toString() + "(" + Utils::String::Number(c->iIndex) + ")");
		}
	}
}
 
Utils::WString CXspFile::formatShipData(const Utils::WStringList &cockpits, int *text, int game)
{
	Utils::WString data = (game == GAME_X3) ? this->GetX3ShipData() : this->GetTCShipData();
	// do turrets
	for ( int t = 0; t < 6; t++ )
	{
		int oldPos = 0;
		Utils::WString turret = data.token(L";", 32 + (t * 2));
		if ( !turret.isNumber() )
		{
			if ( turret.contains(L"(") )
			{
				oldPos = turret.tokens(L"(", 2).token(L")", 1);
				turret = turret.token(L"(", 1);
			}
			int pos = cockpits.findPos(turret);
			if ( pos < 0 )	pos = oldPos;
			if (static_cast<size_t>(pos) >= cockpits.size()) pos = 0;
			data = data.replaceToken(L";", 32 + (t * 2), (long)pos);
		}
	}
	// adjust the weapons
	int mask = this->GetLaserMask(game - 1);
	if ( mask != -1 )
		data = data.replaceToken(L";", 19, (long)mask);
	mask = this->GetMissileMask(game - 1);
	if ( mask != -1 )
		data = data.replaceToken(L";", 25, (long)mask);
 
	// fix the ship text
	if ( m_iOrgDesc > 0 )
		(*text) = m_iOrgDesc;
	data = data.replaceToken(L";", 7, (long)*text);
 
	// add the ware id
	data.removeChar(9);
	data.removeEndSpace();
	// remove the end ;
	while ( data.right(1) == L";" ) data.truncate(-1);
	data = data.replaceToken(L";", data.countToken(L";"), this->GetShipID());
	if ( data.right(1) != L";" )
		data += L";";
 
	return data;
}
 

Rev 213	Rev 216
Line 56...	Line 56...
56	`m_iOrgDesc = 0;`	56	`m_iOrgDesc = 0;`
57		57
58	`m_iShipyard = SHIPYARD_NONE;`	58	`m_iShipyard = SHIPYARD_NONE;`
59	`}`	59	`}`
60		60
61	`void CXspFile::AddText ( int id, const Utils::String &name, const Utils::String &desc )`	61	`void CXspFile::addText(int id, const Utils::WString &name, const Utils::WString &desc)`
62	`{`	62	`{`
63	`// first check if theres an existing id`	63	`// first check if theres an existing id`
64	`SText *newtext = NULL;`	64	`SText *newtext = NULL;`
65	`for ( SText *t = m_lText.First(); t; t = m_lText.Next() )`	65	`for ( SText *t = m_lText.First(); t; t = m_lText.Next() )`
66	`{`	66	`{`
Line 95...	Line 95...
95	`return;`	95	`return;`
96	`}`	96	`}`
97	`}`	97	`}`
98	`}`	98	`}`
99		99
100	`void CXspFile::AddDummy ( const Utils::String &section, const Utils::String &data )`	100	`void CXspFile::addDummy(const Utils::WString &section, const Utils::WString &data)`
101	`{`	101	`{`
102	`SDummy *d = new SDummy;`	102	`SDummy *d = new SDummy;`
103	`d->sData = data;`	103	`d->sData = data;`
104	`d->sSection = section;`	104	`d->sSection = section;`
105		105
106	`if ( d->sData.right(1) != ";" )`	106	`if ( d->sData.right(1) != L";" )`
107	`d->sData += ";";`	107	`d->sData += L";";`
108		108
109	`m_lDummy.push_back ( d );`	109	`m_lDummy.push_back ( d );`
110		110
111	`_changed();`	111	`_changed();`
112	`}`	112	`}`
113		113
114	`void CXspFile::AddComponent ( const Utils::String &;section, const Utils::String &section2, const Utils::String &data )`	114	`void CXspFile::addComponent(const Utils::WString &;section, const Utils::WString &section2, const Utils::WString &data)`
115	`{`	115	`{`
116	`SComponent *c = new SComponent;`	116	`SComponent *c = new SComponent;`
117	`c->sData = data;`	117	`c->sData = data;`
118	`c->sSection = section;`	118	`c->sSection = section;`
119	`c->sSection2 = section2;`	119	`c->sSection2 = section2;`
120		120
121	`if ( c->sData.right(1) != ";" )`	121	`if ( c->sData.right(1) != L";" )`
122	`c->sData += ";";`	122	`c->sData += L";";`
123		123
124	`m_lComponent.push_back ( c );`	124	`m_lComponent.push_back ( c );`
125		125
126	`_changed();`	126	`_changed();`
127	`}`	127	`}`
Line 207...	Line 207...
207	`values += (long)wNode->Data()->iGame;`	207	`values += (long)wNode->Data()->iGame;`
208	`values += L":";`	208	`values += L":";`
209	`values += (long)wNode->Data()->iMask;`	209	`values += (long)wNode->Data()->iMask;`
210	`}`	210	`}`
211	`values += L" ";`	211	`values += L" ";`
212	`values += cockpit->sCockpit.toWString() + L"\n";`	212	`values += cockpit->sCockpit + L"\n";`
213	`}`	213	`}`
214		214
215	`for ( CListNode<SText> *tNode = m_lText.Front(); tNode; tNode = tNode->next() )`	215	`for ( CListNode<SText> *tNode = m_lText.Front(); tNode; tNode = tNode->next() )`
216	`values += Utils::WString(L"Text: ") + (long)tNode->Data()->iId + L"\|" + tNode->Data()->sName.toWString().findReplace(L"\|", L"<::PiPe::>") + L"\|" + tNode->Data()->sDesc.toWString() + L"\n";`	216	`values += Utils::WString(L"Text: ") + (long)tNode->Data()->iId + L"\|" + tNode->Data()->sName.findReplace(L"\|", L"<::PiPe::>") + L"\|" + tNode->Data()->sDesc + L"\n";`
217		217
218	`for ( CListNode<SComponent> *cNode = m_lComponent.Front(); cNode; cNode = cNode->next() )`	218	`for ( CListNode<SComponent> *cNode = m_lComponent.Front(); cNode; cNode = cNode->next() )`
219	`values += L"Component: " + cNode->Data()->sData.toWString().findReplace(L"\|", L"<::PiPe::>") + L"\|" + cNode->Data()->sSection.toWString().findReplace(L"\|", L"<::PiPe::>") + L";\|" + cNode->Data()->sSection2.toWString() + L"\n";`	219	`values += L"Component: " + cNode->Data()->sData.findReplace(L"\|", L"<::PiPe::>") + L"\|" + cNode->Data()->sSection.findReplace(L"\|", L";<::PiPe::>") + L"\|" + cNode->Data()->sSection2 + L"\n";`
220		220
221	`for ( CListNode<SDummy> *dNode = m_lDummy.Front(); dNode; dNode = dNode->next() )`	221	`for ( CListNode<SDummy> *dNode = m_lDummy.Front(); dNode; dNode = dNode->next() )`
222	`values += L"Dummy: " + dNode->Data()->sData.toWString().findReplace(L"\|", L"<::PiPe::>") + L"\|" + dNode->Data()->sSection.toWString() + L"\n";`	222	`values += L"Dummy: " + dNode->Data()->sData.findReplace(L"\|", L"<::PiPe::>") + L"\|" + dNode->Data()->sSection + L"\n";`
223		223
224	`for ( CListNode<SWeaponMask> *wNode = m_lWeaponMasks.Front(); wNode; wNode = wNode->next() )`	224	`for ( CListNode<SWeaponMask> *wNode = m_lWeaponMasks.Front(); wNode; wNode = wNode->next() )`
225	`values += Utils::WString(L"WeaponMask: ") + (long)wNode->Data()->iGame + L" " + (long)wNode->Data()->iMask + L"\n";`	225	`values += Utils::WString(L"WeaponMask: ") + (long)wNode->Data()->iGame + L" " + (long)wNode->Data()->iMask + L"\n";`
226	`for ( CListNode<SWeaponMask> *mNode = m_lMissileMasks.Front(); mNode; mNode = mNode->next() )`	226	`for ( CListNode<SWeaponMask> *mNode = m_lMissileMasks.Front(); mNode; mNode = mNode->next() )`
227	`values += Utils::WString(L"MissileMask: ") + (long)mNode->Data()->iGame + L" " + (long)mNode->Data()->iMask + L"\n";`	227	`values += Utils::WString(L"MissileMask: ") + (long)mNode->Data()->iGame + L" " + (long)mNode->Data()->iMask + L"\n";`
228	`for (auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)`	228	`for (auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)`
229	`values += L"CutData: " + (*itr)->str.toWString() + L"\n";`	229	`values += L"CutData: " + (*itr)->str + L"\n";`
230	`for (auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)`	230	`for (auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)`
231	`values += L"Bodies: " + (*itr)->str.toWString() + L"\n";`	231	`values += L"Bodies: " + (*itr)->str + L"\n";`
232	`for (auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)`	232	`for (auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)`
233	`values += L"Animations: " + (*itr)->str.toWString() + L"\n";`	233	`values += L"Animations: " + (*itr)->str + L"\n";`
234		234
235	`return values;`	235	`return values;`
236	`}`	236	`}`
237		237
238	`bool CXspFile::parseValueLine(const Utils::WString &sLine)`	238	`bool CXspFile::parseValueLine(const Utils::WString &sLine)`
Line 251...	Line 251...
251	`else if ( first.Compare(L"OrgDesc") \|\| first.Compare(L"OriginalDesc") )`	251	`else if ( first.Compare(L"OrgDesc") \|\| first.Compare(L"OriginalDesc") )`
252	`m_iOrgDesc = rest;`	252	`m_iOrgDesc = rest;`
253	`else if ( first.Compare(L"Shipyard") )`	253	`else if ( first.Compare(L"Shipyard") )`
254	`m_iShipyard = rest;`	254	`m_iShipyard = rest;`
255	`else if ( first.Compare(L"CutData") )`	255	`else if ( first.Compare(L"CutData") )`
256	`this->addCutData(rest.toString());`	256	`this->addCutData(rest);`
257	`else if ( first.Compare(L"Bodies") )`	257	`else if ( first.Compare(L"Bodies") )`
258	`this->addBodies(rest.toString());`	258	`this->addBodies(rest);`
259	`else if ( first.Compare(L"Animations") )`	259	`else if ( first.Compare(L"Animations") )`
260	`this->addAnimation(rest.toString());`	260	`this->addAnimation(rest);`
261	`else if ( first.Compare(L"Cockpit") )`	261	`else if ( first.Compare(L"Cockpit") )`
262	`this->AddCockpit(rest.toString(), 0);`	262	`this->addCockpit(rest, 0);`
263	`else if ( first.Compare(L"CockpitNew") )`	263	`else if ( first.Compare(L"CockpitNew") )`
264	`{`	264	`{`
265	`Utils::WString cockpit = rest.tokens(L" ", 2);`	265	`Utils::WString cockpit = rest.tokens(L" ", 2);`
266	`Utils::WString sMasks = rest.token(L" ", 1);`	266	`Utils::WString sMasks = rest.token(L" ", 1);`
267	`this->AddCockpit(cockpit.toString(), 0, -1);`	267	`this->addCockpit(cockpit, 0, -1);`
268	`int num = sMasks.token(L":", 1);`	268	`int num = sMasks.token(L":", 1);`
269	`for ( int i = 0; i < num; i++ )`	269	`for ( int i = 0; i < num; i++ )`
270	`{`	270	`{`
271	`int mask = sMasks.token(L":", ((i + 1) * 2) + 1);`	271	`int mask = sMasks.token(L":", ((i + 1) * 2) + 1);`
272	`int game = sMasks.token(L":", ((i + 1) * 2));`	272	`int game = sMasks.token(L":", ((i + 1) * 2));`
273	`this->AddCockpit(cockpit.toString(), game, mask);`	273	`this->addCockpit(cockpit, game, mask);`
274	`}`	274	`}`
275	`}`	275	`}`
276	`else if ( first == L"Web" ) this->setWebSite(rest);`	276	`else if ( first == L"Web" ) this->setWebSite(rest);`
277	`else if ( first.Compare(L"WeaponMask") )`	277	`else if ( first.Compare(L"WeaponMask") )`
278	`this->AddWeaponMask(rest.token(L" ", 1), rest.token(L" ", 2));`	278	`this->AddWeaponMask(rest.token(L" ", 1), rest.token(L" ", 2));`
Line 280...	Line 280...
280	`this->AddMissileMask(rest.token(L" ", 1), rest.token(L" ", 2));`	280	`this->AddMissileMask(rest.token(L" ", 1), rest.token(L" ", 2));`
281	`else if ( first == L"Text" )`	281	`else if ( first == L"Text" )`
282	`{`	282	`{`
283	`SText *text = new SText;`	283	`SText *text = new SText;`
284	`text->iId = rest.token(L"\|", 1);`	284	`text->iId = rest.token(L"\|", 1);`
285	`text->sName = rest.token(L"\|", 2).toString();`	285	`text->sName = rest.token(L"\|", 2);`
286	`text->sName = text->sName.findReplace(L"<::PiPe::>", L"\|");`	286	`text->sName = text->sName.findReplace(L"<::PiPe::>", L"\|");`
287	`text->sDesc = rest.tokens(L"\|", 3).toString();`	287	`text->sDesc = rest.tokens(L"\|", 3);`
288	`m_lText.push_back ( text );`	288	`m_lText.push_back ( text );`
289	`}`	289	`}`
290	`else if ( first == L"Component" )`	290	`else if ( first == L"Component" )`
291	`{`	291	`{`
292	`SComponent *c = new SComponent;`	292	`SComponent *c = new SComponent;`
293	`c->sData = rest.token(L"\|", 1).toString();`	293	`c->sData = rest.token(L"\|", 1);`
294	`c->sData = c->sData.findReplace (L"<::PiPe::>", L"\|");`	294	`c->sData = c->sData.findReplace (L"<::PiPe::>", L"\|");`
295	`c->sSection = rest.token(L"\|", 2).toString();`	295	`c->sSection = rest.token(L"\|", 2);`
296	`c->sSection = c->sSection.findReplace (L"<::PiPe::>", L"\|");`	296	`c->sSection = c->sSection.findReplace (L"<::PiPe::>", L"\|");`
297	`c->sSection2 = rest.tokens(L"\|", 3).toString();`	297	`c->sSection2 = rest.tokens(L"\|", 3);`
298	`m_lComponent.push_back ( c );`	298	`m_lComponent.push_back ( c );`
299	`}`	299	`}`
300	`else if ( first == L"Dummy" )`	300	`else if ( first == L"Dummy" )`
301	`{`	301	`{`
302	`SDummy *d = new SDummy;`	302	`SDummy *d = new SDummy;`
303	`d->sData = rest.token(L"\|", 1).toString();`	303	`d->sData = rest.token(L"\|", 1);`
304	`d->sData = d->sData.findReplace (L"<::PiPe::>", L"\|");`	304	`d->sData = d->sData.findReplace (L"<::PiPe::>", L"\|");`
305	`d->sSection = rest.tokens(L"\|", 2).toString();`	305	`d->sSection = rest.tokens(L"\|", 2);`
306	`m_lDummy.push_back ( d );`	306	`m_lDummy.push_back ( d );`
307	`}`	307	`}`
308	`else if ( first == L"Comment" ) this->setDescription(rest.findReplace(L"<newline>", L"<br>"));`	308	`else if ( first == L"Comment" ) this->setDescription(rest.findReplace(L"<newline>", L"<br>"));`
309	`else`	309	`else`
310	`return CBaseFile::parseValueLine(sLine);`	310	`return CBaseFile::parseValueLine(sLine);`
Line 319...	Line 319...
319	`{`	319	`{`
320	`for ( SText *text = m_lText.First(); text; text = m_lText.Next() )`	320	`for ( SText *text = m_lText.First(); text; text = m_lText.Next() )`
321	`{`	321	`{`
322	`if ( text->iId == lang )`	322	`if ( text->iId == lang )`
323	`{`	323	`{`
324	`name = text->sName.toWString();`	324	`name = text->sName;`
325	`break;`	325	`break;`
326	`}`	326	`}`
327	`}`	327	`}`
328	`}`	328	`}`
329		329
Line 625...	Line 625...
625	`newFile->ReadFromData((char *)(compr + pos), rest.word(2));`	625	`newFile->ReadFromData((char *)(compr + pos), rest.word(2));`
626		626
627	`start += (newFile->GetDataSize() + 1);`	627	`start += (newFile->GetDataSize() + 1);`
628	`}`	628	`}`
629	`else if ( first.Compare("Text") )`	629	`else if ( first.Compare("Text") )`
630	`this->AddText(rest.token(":", 1), rest.token(":", 2), rest.tokens(":", 3));`	630	`this->addText(rest.token(":", 1), rest.token(":", 2), rest.tokens(":", 3));`
631	`else if ( first.Compare("Component") )`	631	`else if ( first.Compare("Component") )`
632	`this->AddComponent(rest.token(";", 1), rest.token(";", 2), rest.tokens(";", 3));`	632	`this->addComponent(rest.token(";", 1), rest.token(";", 2), rest.tokens(";", 3));`
633	`else if ( first.Compare("Dummy") )`	633	`else if ( first.Compare("Dummy") )`
634	`{`	634	`{`
635	`SDummy *d = new SDummy;`	635	`SDummy *d = new SDummy;`
636	`d->sData = rest.tokens(";", 2);`	636	`d->sData = rest.tokens(";", 2).toWString();`
637	`d->sSection = rest.token(";", 1);`	637	`d->sSection = rest.token(";", 1).toWString();`
638	`m_lDummy.push_back ( d );`	638	`m_lDummy.push_back ( d );`
639	`}`	639	`}`
640	`else if ( !this->parseValueLine(line) )`	640	`else if ( !this->parseValueLine(line) )`
641	`{`	641	`{`
642	`// printf ( "Command: %s, Rest: %s\n", first.c_str(), rest.c_str());`	642	`// printf ( "Command: %s, Rest: %s\n", first.c_str(), rest.c_str());`
Line 656...	Line 656...
656	`}`	656	`}`
657		657
658		658
659	`int GetMaxShipyards() { return (int)SHIPYARD_MAX; }`	659	`int GetMaxShipyards() { return (int)SHIPYARD_MAX; }`
660		660
661	`Utils::String GetShipyardName (int s)`	661	`Utils::WString GetShipyardName (int s)`
662	`{`	662	`{`
663	`switch (s)`	663	`switch (s)`
664	`{`	664	`{`
665	`case SHIPYARD_ARGON:`	665	`case SHIPYARD_ARGON:`
666	`return "Argon";`	666	`return L"Argon";`
667	`case SHIPYARD_BORON:`	667	`case SHIPYARD_BORON:`
668	`return "Boron";`	668	`return L"Boron";`
669	`case SHIPYARD_PARANID:`	669	`case SHIPYARD_PARANID:`
670	`return "Paranid";`	670	`return L"Paranid";`
671	`case SHIPYARD_SPLIT:`	671	`case SHIPYARD_SPLIT:`
672	`return "Split";`	672	`return L"Split";`
673	`case SHIPYARD_TELADI:`	673	`case SHIPYARD_TELADI:`
674	`return "Teladi";`	674	`return L"Teladi";`
675	`case SHIPYARD_PIRATES:`	675	`case SHIPYARD_PIRATES:`
676	`return "Pirates";`	676	`return L"Pirates";`
677	`case SHIPYARD_FRIEND:`	677	`case SHIPYARD_FRIEND:`
678	`return "Friendly";`	678	`return L"Friendly";`
679	`case SHIPYARD_XENON:`	679	`case SHIPYARD_XENON:`
680	`return "Xenon";`	680	`return L"Xenon";`
681	`case SHIPYARD_TERRAN:`	681	`case SHIPYARD_TERRAN:`
682	`return "Terran";`	682	`return L"Terran";`
683	`}`	683	`}`
684		684
685	`return "Unknown";`	685	`return L"Unknown";`
686	`}`	686	`}`
687		687
688	`bool CXspFile::writeHeader(CFileIO &file, int valueheader, int valueComprLen) const`	688	`bool CXspFile::writeHeader(CFileIO &file, int valueheader, int valueComprLen) const`
689	`{`	689	`{`
690	`return file.write("XSPCycrow;%.2f;%d;%d\n", FILEVERSION, valueheader, valueComprLen);`	690	`return file.write("XSPCycrow;%.2f;%d;%d\n", FILEVERSION, valueheader, valueComprLen);`
Line 793...	Line 793...
793	`{`	793	`{`
794	`list->pushBack(L"# Shipyards, Set which shipyards to add ships for sale to");`	794	`list->pushBack(L"# Shipyards, Set which shipyards to add ships for sale to");`
795	`for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )`	795	`for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )`
796	`{`	796	`{`
797	`if ( this->IsShipyard(i) )`	797	`if ( this->IsShipyard(i) )`
798	`list->pushBack(L"Shipyard: " + GetShipyardName(i).toWString());`	798	`list->pushBack(L"Shipyard: " + GetShipyardName(i));`
799	`}`	799	`}`
800	`list->pushBack(L"");`	800	`list->pushBack(L"");`
801	`}`	801	`}`
802		802
803	`if ( m_iOrgDesc > 0 )`	803	`if ( m_iOrgDesc > 0 )`
Line 828...	Line 828...
828	`}`	828	`}`
829		829
830	`if ( m_lText.size() ) {`	830	`if ( m_lText.size() ) {`
831	`list->pushBack(L"# Ship Texts, the name/description of the ship in each language: <LANGID> <NAME>\|<DESCRIPTION>");`	831	`list->pushBack(L"# Ship Texts, the name/description of the ship in each language: <LANGID> <NAME>\|<DESCRIPTION>");`
832	`for(CListNode<SText> *node = m_lText.Front(); node; node = node->next()) {`	832	`for(CListNode<SText> *node = m_lText.Front(); node; node = node->next()) {`
833	`list->pushBack(Utils::WString(L"ShipText: ") + (long)node->Data()->iId + L" " + node->Data()->sName.toWString() + L"\|" + node->Data()->sDesc.toWString());`	833	`list->pushBack(Utils::WString(L"ShipText: ") + (long)node->Data()->iId + L" " + node->Data()->sName + L"\|" + node->Data()->sDesc);`
834	`}`	834	`}`
835		835
836	`list->pushBack(L"");`	836	`list->pushBack(L"");`
837	`}`	837	`}`
838		838
Line 855...	Line 855...
855	`}`	855	`}`
856		856
857	`if ( this->m_lComponent.size() ) {`	857	`if ( this->m_lComponent.size() ) {`
858	`list->pushBack(L"# Ship Components, each component used in the ships scene: <SECTION> <MODELENTRY> <VALUES>");`	858	`list->pushBack(L"# Ship Components, each component used in the ships scene: <SECTION> <MODELENTRY> <VALUES>");`
859	`for(CListNode<SComponent> *node = m_lComponent.Front(); node; node = node->next()) {`	859	`for(CListNode<SComponent> *node = m_lComponent.Front(); node; node = node->next()) {`
860	`list->pushBack(Utils::WString(L"Component: ") + node->Data()->sSection.toWString() + L" " + node->Data()->sSection2.toWString() + L" " + node->Data()->sData.toWString());`	860	`list->pushBack(Utils::WString(L"Component: ") + node->Data()->sSection + L" " + node->Data()->sSection2 + L" " + node->;Data()->sData);`
861	`}`	861	`}`
862	`list->pushBack(L"");`	862	`list->pushBack(L"");`
863	`}`	863	`}`
864		864
865	`if ( this->m_lDummy.size() ) {`	865	`if ( this->m_lDummy.size() ) {`
866	`list->pushBack(L"# Ship Dummies, each dummy entry used in the ships scene: <SECTION> <VALUE>");`	866	`list->pushBack(L"# Ship Dummies, each dummy entry used in the ships scene: <SECTION> <VALUE>");`
867	`for(CListNode<SDummy> *node = m_lDummy.Front(); node; node = node->next()) {`	867	`for(CListNode<SDummy> *node = m_lDummy.Front(); node; node = node->next()) {`
868	`list->pushBack(L"Dummy: " + node->Data()->sSection.toWString() + L"; " + node->Data()->sData.toWString());`	868	`list->pushBack(L"Dummy: " + node->Data()->sSection + L"; " + node->Data()->sData);`
869	`}`	869	`}`
870	`list->pushBack(L"");`	870	`list->pushBack(L"");`
871	`}`	871	`}`
872		872
873	`if ( this->m_lCockpit.size() ) {`	873	`if ( this->m_lCockpit.size() ) {`
874	`list->pushBack(L"# Cockpit entries, each cockpit value with thier weapons mask");`	874	`list->pushBack(L"# Cockpit entries, each cockpit value with thier weapons mask");`
875	`for(CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next()) {`	875	`for(CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next()) {`
876	`list->pushBack(L"Cockpit: " + node->Data()->sCockpit.toWString().token(L";", 19) + L" " + node->Data()->sCockpit.toWString());`	876	`list->pushBack(L"Cockpit: " + node->Data()->sCockpit.token(L";", 19) + L" " + node->Data()->sCockpit);`
877	`for(SWeaponMask *mask = node->Data()->lWeaponMask.First(); mask; mask = node->Data()->lWeaponMask.Next()) {`	877	`for(SWeaponMask *mask = node->Data()->lWeaponMask.First(); mask; mask = node->Data()->lWeaponMask.Next()) {`
878	`list->pushBack(L"CockpitWeapon: " + node->Data()->sCockpit.toWString().token(L";", 19) + L" " + (long)mask->iGame + L" " + (long)mask->iMask);`	878	`list->pushBack(L"CockpitWeapon: " + node->Data()->sCockpit.token(L";", 19) + L" " + (long)mask->iGame + L" " + (long)mask->iMask);`
879	`}`	879	`}`
880	`}`	880	`}`
881		881
882	`list->pushBack(L"");`	882	`list->pushBack(L"");`
883	`}`	883	`}`
884		884
885	`if (!this->_lCutData.empty())`	885	`if (!this->_lCutData.empty())`
886	`{`	886	`{`
887	`list->pushBack(L"# Ship Cut Data");`	887	`list->pushBack(L"# Ship Cut Data");`
888	`for(auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)`	888	`for(auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)`
889	`list->pushBack(L"CutData: " + (*itr)->str.toWString());`	889	`list->pushBack(L"CutData: " + (*itr)->str);`
890	`list->pushBack(L"");`	890	`list->pushBack(L"");`
891	`}`	891	`}`
892		892
893	`if (!this->_lBodies.empty())`	893	`if (!this->_lBodies.empty())`
894	`{`	894	`{`
895	`list->pushBack(L"# Ship Bodies");`	895	`list->pushBack(L"# Ship Bodies");`
896	`for(auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)`	896	`for(auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)`
897	`list->pushBack(L"Bodies: " + (*itr)->str.toWString());`	897	`list->pushBack(L"Bodies: " + (*itr)->str);`
898	`list->pushBack(L"");`	898	`list->pushBack(L"");`
899	`}`	899	`}`
900		900
901	`if (!this->_lAnimations.empty())`	901	`if (!this->_lAnimations.empty())`
902	`{`	902	`{`
903	`list->pushBack(L"# Ship Animations");`	903	`list->pushBack(L"# Ship Animations");`
904	`for (auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)`	904	`for (auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)`
905	`list->pushBack(L"Animation: " + (*itr)->str.toWString());`	905	`list->pushBack(L"Animation: " + (*itr)->str);`
906	`list->pushBack(L"");`	906	`list->pushBack(L"");`
907	`}`	907	`}`
908		908
909	`if ( !datafile )`	909	`if ( !datafile )`
910	`{`	910	`{`
Line 913...	Line 913...
913	`}`	913	`}`
914		914
915	`return true;`	915	`return true;`
916	`}`	916	`}`
917		917
918	`void CXspFile::_addSection(Utils::CList<STypesSection> &list, const Utils::String &section, const Utils::String &data)`	918	`void CXspFile::_addSection(Utils::CList<STypesSection> &list, const Utils::WString &section, const Utils::WString &data)`
919	`{`	919	`{`
920	`STypesSection *currentSubSection = NULL;`	920	`STypesSection *currentSubSection = NULL;`
921	`for(Utils::CList<STypesSection>::iterator itr = list.begin(); itr != list.end(); itr++) {`	921	`for(Utils::CList<STypesSection>::iterator itr = list.begin(); itr != list.end(); itr++) {`
922	`if ( (*itr)->sSection.Compare(section) ) {`	922	`if ( (*itr)->sSection.Compare(section) ) {`
923	`currentSubSection = *itr;`	923	`currentSubSection = *itr;`
Line 929...	Line 929...
929	`currentSubSection = new STypesSection;`	929	`currentSubSection = new STypesSection;`
930	`currentSubSection->sSection = section;`	930	`currentSubSection->sSection = section;`
931	`list.push_back(currentSubSection);`	931	`list.push_back(currentSubSection);`
932	`}`	932	`}`
933		933
934	`currentSubSection->lEntries.pushBack(data, "");`	934	`currentSubSection->lEntries.pushBack(data, L"");`
935	`}`	935	`}`
936		936
937	`void CXspFile::_addDataSection(Utils::CStringList& list, Utils::CList<STypesSection>& sectionList, bool bUseFirst)`	937	`void CXspFile::_addDataSection(Utils::WStringList& list, Utils::CList<STypesSection>& sectionList, bool bUseFirst)`
938	`{`	938	`{`
939	`for(auto itr = list.begin(); itr != list.end(); itr++)`	939	`for(auto itr = list.begin(); itr != list.end(); itr++)`
940	`{`	940	`{`
941	`if (bUseFirst) {`	941	`if (bUseFirst) {`
942	`Utils::String data = (*itr)->str;`	942	`Utils::WString data = (*itr)->str;`
943	`_addSection(sectionList, data.token(";", 1), data.tokens(";", 2));`	943	`_addSection(sectionList, data.token(L";", 1), data.tokens(L";", 2));`
944	`}`	944	`}`
945	`else {`	945	`else {`
946	`_addSection(sectionList, (itr)->str, (itr)->data);`	946	`_addSection(sectionList, (itr)->str, (itr)->data);`
947	`}`	947	`}`
948	`}`	948	`}`
Line 990...	Line 990...
990	`}`	990	`}`
991		991
992		992
993	`void CXspFile::addGeneratedFiles(HZIP &hz)`	993	`void CXspFile::addGeneratedFiles(HZIP &hz)`
994	`{`	994	`{`
995	`TCHAR buf[5000];`	-
996		-
997	`CFileIO tmpFile(CPackages::tempDirectory() + "/temp.tmp");`	995	`CFileIO tmpFile(CPackages::tempDirectory() + L"/temp.tmp");`
998		996
999	`for(int i = 0; i < 5; i++) {`	997	`for(int i = 0; i < 5; i++) {`
1000	`Utils::String type;`	998	`Utils::WString type;`
1001	`Utils::String data;`	999	`Utils::WString data;`
1002	`switch(i) {`	1000	`switch(i) {`
1003	`case 0:`	1001	`case 0:`
1004	`data = "50;1\r\n" + this->m_sData;`	1002	`data = L"50;1\r\n" + this->m_sData.toWString();`
1005	`type = "TShips";`	1003	`type = L"TShips";`
1006	`break;`	1004	`break;`
1007	`case 1:`	1005	`case 1:`
1008	`if ( !this->m_lCockpit.empty() ) {`	1006	`if ( !this->m_lCockpit.empty() ) {`
1009	`data = Utils::String("51;") + (long)this->m_lCockpit.size() + ";\r\n";`	1007	`data = Utils::WString("51;") + (long)this->m_lCockpit.size() + L";\r\n";`
1010	`for(CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next()) {`	1008	`for(CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next()) {`
1011	`data += node->Data()->sCockpit + "\r\n";`	1009	`data += node->Data()->sCockpit + L"\r\n";`
1012	`}`	1010	`}`
1013	`type = "TCockpits";`	1011	`type = L"TCockpits";`
1014	`}`	1012	`}`
1015	`break;`	1013	`break;`
1016	`case 2:`	1014	`case 2:`
1017	`if ( !this->m_lComponent.empty() ) {`	1015	`if ( !this->m_lComponent.empty() ) {`
1018	`type = "Components";`	1016	`type = L"Components";`
1019	`CLinkList<SComponentEntry> componentList;`	1017	`CLinkList<SComponentEntry> componentList;`
1020	`this->addComponentsToList(componentList);`	1018	`this->addComponentsToList(componentList);`
1021	`for(CListNode<SComponentEntry> *node = componentList.Front(); node; node = node->next()) {`	1019	`for(CListNode<SComponentEntry> *node = componentList.Front(); node; node = node->next()) {`
1022	`data += node->Data()->sSection + "; " + (long)node->Data()->lEntries.size() + ";\r\n";`	1020	`data += node->Data()->sSection + L"; " + (long)node->Data()->lEntries.size() + L";\r\n";`
1023	`data += CXspFile::TypesListToString(node->Data()->lEntries, true);`	1021	`data += CXspFile::TypesListToString(node->Data()->lEntries, true);`
1024	`}`	1022	`}`
1025	`}`	1023	`}`
1026	`break;`	1024	`break;`
1027	`case 3:`	1025	`case 3:`
1028	`GENERATESECTION("Dummies", SDummy, this->m_lDummy);`	1026	`GENERATESECTION(L"Dummies", SDummy, this->m_lDummy);`
1029	`break;`	1027	`break;`
1030	`case 4:`	1028	`case 4:`
1031	`GENERATESTRINGSECTION("Bodies", this->_lBodies, true);`	1029	`GENERATESTRINGSECTION(L"Bodies", this->_lBodies, true);`
1032	`break;`	1030	`break;`
1033	`}`	1031	`}`
1034		1032
1035	`if ( type.empty() ) continue;`	1033	`if ( type.empty() ) continue;`
1036		1034
1037	`Utils::String fname = "GENERATED/types/" + type + ".txt";`	1035	`Utils::WString fname = L"GENERATED/types/" + type + L".txt";`
1038		1036
1039	`Utils::String fileData = "// Exported " + type + " file, Generated by SPK Libraries V" + Utils::String::FromFloat(GetLibraryVersion(), 2) + "\r\n" + data;`	1037	`Utils::WString fileData = L"// Exported " + type + L" file, Generated by SPK Libraries V" + Utils::WString::FromFloat(GetLibraryVersion(), 2) + L"\r\n" + data;`
-		1038	`/*`
1040	`if ( tmpFile.startWrite() ) {`	1039	`if ( tmpFile.startWrite() ) {`
1041	`tmpFile.write(fileData.c_str(), fileData.length());`	1040	`tmpFile.write(fileData.c_str(), fileData.length());`
1042	`tmpFile.close();`	1041	`tmpFile.close();`
1043	`}`	1042	`}`
1044		1043
1045	`// tships files`	1044	`// tships files`
1046	`wsprintf(buf, L"%hs", fname.c_str());`	1045	`wsprintf(buf, L"%hs", fname.c_str());`
1047		-
1048	`if ( tmpFile.startRead() ) {`	1046	`if ( tmpFile.startRead() ) {`
1049	`size_t dataSize = 0;`	1047	`*/`
1050	`unsigned char *data = tmpFile.readAll(&dataSize);`	1048	`ZipAdd(hz, fname.c_str(), (void )fileData.c_str(), fileData.length() sizeof(wchar_t));`
1051	`ZipAdd(hz, buf, data, dataSize);`	-
1052	`}`	1049	`//}`
1053	`}`	1050	`}`
1054	`}`	1051	`}`
1055		1052
1056	`bool CXspFile::loadPackageData(const Utils::WString &sFirst, const Utils::WString &sRest, const Utils::WString &sMainGame, Utils::WStringList &otherGames, Utils::WStringList &gameAddons, CProgressInfo *progress)`	1053	`bool CXspFile::loadPackageData(const Utils::WString &sFirst, const Utils::WString &sRest, const Utils::WString &sMainGame, Utils::WStringList &otherGames, Utils::WStringList &gameAddons, CProgressInfo *progress)`
1057	`{`	1054	`{`
Line 1078...	Line 1075...
1078	`else if ( sFirst.Compare(L"ExistingShip") )`	1075	`else if ( sFirst.Compare(L"ExistingShip") )`
1079	`m_bExistingShip = true;`	1076	`m_bExistingShip = true;`
1080	`else if ( sFirst.Compare(L"ShipID") )`	1077	`else if ( sFirst.Compare(L"ShipID") )`
1081	`m_sID = sRest.toString();`	1078	`m_sID = sRest.toString();`
1082	`else if ( sFirst.Compare(L"ShipText") )`	1079	`else if ( sFirst.Compare(L"ShipText") )`
1083	`this->AddText(sRest.token(L" ", 1).toLong(), sRest.tokens(L" ", 2).token(L"\|", 1).toString(), sRest.tokens(L" ", 2).tokens(L"\|", 2).toString());`	1080	`this->addText(sRest.token(L" ", 1).toLong(), sRest.tokens(L" ", 2).token(L"\|", 1), sRest.tokens(L" ", 2).tokens(L"\|", 2));`
1084	`else if ( sFirst.Compare(L"Component") )`	1081	`else if ( sFirst.Compare(L"Component") )`
1085	`this->AddComponent(sRest.token(L" ", 1).toString(), sRest.token(L" ", 2).toString(), sRest.tokens(L" ", 3).toString());`	1082	`this->addComponent(sRest.token(L" ", 1), sRest.token(L" ", 2), sRest.tokens(L" ", 3));`
1086	`else if ( sFirst.Compare(L"Cockpit") )`	1083	`else if ( sFirst.Compare(L"Cockpit") )`
1087	`this->AddCockpit(sRest.tokens(L" ", 2).replaceToken(L";", 19, sRest.token(L" ", 1)).toString(), 0);`	1084	`this->addCockpit(sRest.tokens(L" ", 2).replaceToken(L";", 19, sRest.token(L" ", 1)), 0);`
1088	`else if ( sFirst.Compare(L"CockpitWeapon") )`	1085	`else if ( sFirst.Compare(L"CockpitWeapon") )`
1089	`this->AddCockpitWeapon(sRest.token(L" ", 1).toString(), sRest.token(L" ", 2), sRest.token(L" ", 3));`	1086	`this->addCockpitWeapon(sRest.token(L" ", 1), sRest.token(L" ", 2), sRest.token(L" ", 3));`
1090	`else if ( sFirst.Compare(L"WeaponMask") )`	1087	`else if ( sFirst.Compare(L"WeaponMask") )`
1091	`this->AddWeaponMask(sRest.token(L" ", 1), sRest.token(L" ", 2));`	1088	`this->AddWeaponMask(sRest.token(L" ", 1), sRest.token(L" ", 2));`
1092	`else if ( sFirst.Compare(L"MissileMask") )`	1089	`else if ( sFirst.Compare(L"MissileMask") )`
1093	`this->AddMissileMask(sRest.token(L" ", 1), sRest.token(L" ", 2));`	1090	`this->AddMissileMask(sRest.token(L" ", 1), sRest.token(L" ", 2));`
1094	`else if ( sFirst.Compare(L"Dummy") )`	1091	`else if ( sFirst.Compare(L"Dummy") )`
1095	`this->AddDummy(sRest.token(L" ", 1).toString(), sRest.token(L" ", 2).toString());`	1092	`this->addDummy(sRest.token(L" ", 1), sRest.token(L" ", 2));`
1096	`else if ( sFirst.Compare(L"CutData") )`	1093	`else if ( sFirst.Compare(L"CutData") )`
1097	`this->addCutData(sRest.toString());`	1094	`this->addCutData(sRest);`
1098	`else if ( sFirst.Compare(L"Animation") )`	1095	`else if ( sFirst.Compare(L"Animation") )`
1099	`this->addAnimation(sRest.toString());`	1096	`this->addAnimation(sRest);`
1100	`else if ( sFirst.Compare(L"Bodies") )`	1097	`else if ( sFirst.Compare(L"Bodies") )`
1101	`this->addBodies(sRest.toString());`	1098	`this->addBodies(sRest);`
1102	`else if ( !CBaseFile::loadPackageData(sFirst, sRest, sMainGame, otherGames, gameAddons, progress) )`	1099	`else if ( !CBaseFile::loadPackageData(sFirst, sRest, sMainGame, otherGames, gameAddons, progress) )`
1103	`{`	1100	`{`
1104	`return false;`	1101	`return false;`
1105	`}`	1102	`}`
1106		1103
1107	`return true;`	1104	`return true;`
1108	`}`	1105	`}`
Line 1149...	Line 1146...
1149	`data = data.replaceToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass((long)sClass).toString());`	1146	`data = data.replaceToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass((long)sClass).toString());`
1150		1147
1151	`return data;`	1148	`return data;`
1152	`}`	1149	`}`
1153		1150
1154	`bool CXspFile::removeCockpit(const Utils::String &sCockpitId)`	1151	`bool CXspFile::removeCockpit(const Utils::WString &sCockpitId)`
1155	`{`	1152	`{`
1156	`Utils::String cockpitid = sCockpitId;`	1153	`Utils::WString cockpitid = sCockpitId;`
1157	`// if its a whole line, just get the end`	1154	`// if its a whole line, just get the end`
1158	`if ( cockpitid.isin(";") )`	1155	`if ( cockpitid.contains(L";") )`
1159	`{`	1156	`{`
1160	`cockpitid = cockpitid.tokens(";", -2);`	1157	`cockpitid = cockpitid.tokens(L";", -2);`
1161	`while ( cockpitid.right(1) == ";" )`	1158	`while ( cockpitid.right(1) == L";" )`
1162	`cockpitid.truncate(-1);`	1159	`cockpitid.truncate(-1);`
1163	`}`	1160	`}`
1164		1161
1165	`bool ret = false;`	1162	`bool ret = false;`
1166	`for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )`	1163	`for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )`
1167	`{`	1164	`{`
1168	`Utils::String id = node->Data()->sCockpit.token(";", 19);`	1165	`Utils::WString id = node->Data()->sCockpit.token(L";", 19);`
1169	`if ( id.Compare(cockpitid) )`	1166	`if ( id.Compare(cockpitid) )`
1170	`{`	1167	`{`
1171	`node->DeleteData();`	1168	`node->DeleteData();`
1172	`ret = true;`	1169	`ret = true;`
1173	`break;`	1170	`break;`
Line 1177...	Line 1174...
1177	`m_lCockpit.RemoveEmpty();`	1174	`m_lCockpit.RemoveEmpty();`
1178		1175
1179	`return ret;`	1176	`return ret;`
1180	`}`	1177	`}`
1181		1178
1182	`bool CXspFile::removeComponent(const Utils::String &section1, const Utils::String &section2, const Utils::String &data)`	1179	`bool CXspFile::removeComponent(const Utils::WString &section1, const Utils::WString &section2, const Utils::WString &data)`
1183	`{`	1180	`{`
1184	`bool ret = false;`	1181	`bool ret = false;`
1185	`for ( CListNode<SComponent> *node = m_lComponent.Front(); node; node = node->next() )`	1182	`for ( CListNode<SComponent> *node = m_lComponent.Front(); node; node = node->next() )`
1186	`{`	1183	`{`
1187	`if ( node->Data()->sSection.Compare(section1) && node->Data()->sSection2.Compare(section2) && node->Data()->sData.Compare(data) )`	1184	`if ( node->Data()->sSection.Compare(section1) && node->Data()->sSection2.Compare(section2) && node->Data()->sData.Compare(data) )`
1188	`{`	1185	`{`
1189	`ret = true;`	1186	`ret = true;`
1190	`node->DeleteData();`	1187	`node->DeleteData();`
1191	`break;`	1188	`break;`
1192	`}`	1189	`}`
1193	`}`	1190	`}`
1194	`m_lComponent.RemoveEmpty();`	1191	`m_lComponent.RemoveEmpty();`
1195	`return ret;`	1192	`return ret;`
1196	`}`	1193	`}`
1197		1194
1198	`bool CXspFile::removeDummy(const Utils::String &section, const Utils::String &data)`	1195	`bool CXspFile::removeDummy(const Utils::WString &section, const Utils::WString &data)`
1199	`{`	1196	`{`
1200	`bool ret = false;`	1197	`bool ret = false;`
1201	`for ( CListNode<SDummy> *node = m_lDummy.Front(); node; node = node->next() )`	1198	`for ( CListNode<SDummy> *node = m_lDummy.Front(); node; node = node->next() )`
1202	`{`	1199	`{`
1203	`if ( node->Data()->sSection.Compare(section) && node->Data()->sData.Compare(data) )`	1200	`if ( node->Data()->sSection.Compare(section) && node->Data()->sData.Compare(data) )`
Line 1214...	Line 1211...
1214		1211
1215	`Utils::String CXspFile::GetCockpitData(const Utils::String &cid)`	1212	`Utils::String CXspFile::GetCockpitData(const Utils::String &cid)`
1216	`{`	1213	`{`
1217	`for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )`	1214	`for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )`
1218	`{`	1215	`{`
1219	`Utils::String id = node->Data()->sCockpit.token(";", 19);`	1216	`Utils::WString id = node->Data()->sCockpit.token(L";", 19);`
1220	`if ( id.Compare(cid) )`	1217	`if ( id.Compare(cid) )`
1221	`return node->Data()->sCockpit;`	1218	`return node->Data()->sCockpit.toString();`
1222	`}`	1219	`}`
1223		1220
1224	`return "";`	1221	`return "";`
1225	`}`	1222	`}`
1226		1223
1227	`SCockpit *CXspFile::FindCockpit(const Utils::String &cid)`	1224	`SCockpit *CXspFile::FindCockpit(const Utils::String &cid)`
1228	`{`	1225	`{`
1229	`for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )`	1226	`for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )`
1230	`{`	1227	`{`
1231	`Utils::String id = node->Data()->sCockpit.token(";", 19);`	1228	`Utils::WString id = node->Data()->sCockpit.token(L";", 19);`
1232	`if ( id.Compare(cid) )`	1229	`if ( id.Compare(cid) )`
1233	`return node->Data();`	1230	`return node->Data();`
1234	`}`	1231	`}`
1235		1232

Subversion Repositories spk

(root)//libspk/src/XspFile.cpp – Rev 213 → 216