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



									Utils::CList<STypesSection> list;		\
									ADDSECTIONLIST(T, L);					\
									data = CXspFile::TypesListToString(list, true); \
								}
 
#define GENERATESTRINGSECTION(F, L, FIRST) if ( !L.empty() ) {				\
									type = F;								\
									Utils::CList<STypesSection> list;		\
									_addDataSection(L, list, FIRST);		\
									data = CXspFile::TypesListToString(list, true); \
								}

	for ( CListNode<SCockpit> *n = m_lCockpit.Front(); n; n = n->next() )
		n->Data()->lWeaponMask.MemoryClear();
	m_lCockpit.MemoryClear();
	m_lCockpit.destroy();
	_lCutData.clear();
	_lBodies.clear();
	_lAnimations.clear();
}
 
void CXspFile::SetDefaults ()
{
	CBaseFile::SetDefaults ();

 
	for ( CListNode<SWeaponMask> *wNode = m_lWeaponMasks.Front(); wNode; wNode = wNode->next() )
		values += Utils::String("WeaponMask: ") + (long)wNode->Data()->iGame + " " + (long)wNode->Data()->iMask + "\n";
	for ( CListNode<SWeaponMask> *mNode = m_lMissileMasks.Front(); mNode; mNode = mNode->next() )
		values += Utils::String("MissileMask: ") + (long)mNode->Data()->iGame + " " + (long)mNode->Data()->iMask + "\n";
	for (auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)
		values += "CutData: " + (*itr)->str + "\n";
	for (auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)
		values += "Bodies: "; + (*itr)->str + "\n";
	for (auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)
		values += "Animations: "; + (*itr)->str + "\n";
 
	return values;
}
 
bool CXspFile::ParseValueLine(const Utils::String &sLine)

	else if ( first.Compare("Shipyard") )
		m_iShipyard = rest;
	else if ( first.Compare("CutData") )
		this->addCutData(rest);
	else if ( first.Compare("Bodies") )
		this->addBodies(rest);
	else if ( first.Compare("Animations") )
		this->addAnimation(rest);
	else if ( first.Compare("Cockpit") )
		this->AddCockpit(rest, 0);
	else if ( first.Compare("CockpitNew") )
	{
		Utils::String cockpit = rest.tokens(" ", 2);

			}
		}
	}
 
	if ( name.empty() )
		name = getLanguageName(lang);
 
	return name;
}
 
//TODO: split this up

		else if ( first.Compare("ScreenShot") )
		{
			int size = rest.token(" ", 1);
			Utils::String ext = rest.token(" ", 2);
 
			C_File *newFile = this->addFile(m_sID + "_" + (long)(this->countFiles(FILETYPE_SCREEN) + 1) + "." + ext, "", FILETYPE_SCREEN);
			newFile->ReadFromData((char *)(compr + pos), size); 
 
			start += (size + 1);
		}
		else if ( first.Compare("SceneFile") )
		{
			Utils::String file = rest.tokens(" ", 3);
			m_pSceneFile = this->addFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_SHIPSCENE);
			m_pSceneFile->SetCreationTime((long)rest.token(" ", 1));
			m_pSceneFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));
 
			start += m_pSceneFile->GetDataSize();
		}
		else if ( first.Compare("CockpitFile") )
		{
			Utils::String file = rest.tokens(" ", 3);
			m_pCockpitFile = this->addFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_COCKPITSCENE);
			m_pCockpitFile->SetCreationTime((long)rest.token(" ", 1));
			m_pCockpitFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));
 
			start += m_pCockpitFile->GetDataSize();
		}
		else if ( first.Compare("Model") )
		{
			Utils::String file = rest.tokens(" ", 3);
			C_File *newFile= this->addFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_SHIPMODEL);
			newFile->SetCreationTime((long)rest.token(" ", 1));
			newFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));
 
			start += (newFile->GetDataSize() + 1);
		}

				newFile = new C_File(file);
				special = 3;
			}
			else
			{
				newFile = this->addFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_SHIPOTHER);
				newFile->SetCreationTime((long)rest.token(" ", 1));
			}
			newFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));
			start += (newFile->GetDataSize() + 1);
 

			{
				if ( newFile->CheckFileExt("pck") )
					newFile->UnPCKFile();
 
				// read data into lines
				Utils::String data((const char *)newFile->GetData());
				data.removeChar('\r');
				int iLines;
				Utils::String *sLines = data.tokenise("\n", &iLines);
				
				if ( sLines && iLines )
				{
					// cut data
					size_t entries = -1;
					if ( special == 1 )
					{
						Utils::CStringList newLines;
						for ( int i = 0; i < iLines; i++ )
						{
							Utils::String line = sLines[i];
							line.removeChar(' ');
							line.removeChar(9);
							if ( line.empty() || line[0] == '/' )
								continue;
							if ( entries == -1 )
							{
								entries	= line.token(";", 1).toInt() - 36;
								if ( entries <= 0 )
									break;
							}
							else
							{
								int id = line.token(";", 1).toInt();
								if ( id >= 9000 && id <= 9017 )
									continue;
 
								switch (id)
								{

									case 4207:
									case 4107:
										break;
 
									default:
										newLines.pushBack(line);
								}
								if ( newLines.size() == entries )
									break;
							}
						}
 
						for(auto itr = newLines.begin(); itr != newLines.end(); itr++)
							this->addCutData((*itr)->str);
					}
					// bodies
					else if ( special == 2 )
					{
						entries = 0;
						Utils::String section;
						for ( int i = 0; i < iLines; i++ )
						{
							Utils::String line = sLines[i];
							line.removeChar(' ');
							line.removeChar(9);
							if ( line.empty() || line[0] == '/' )
								continue;
							if ( entries <= 0)
							{
								section = line.token(";", 1);
								entries	= line.token(";", 2).toInt();
							}
							else
							{
								if ( !line.isin(";") )
									continue;
								if ( line.countToken(";") <= 2 )
								{
									this->addBodies(section + ";" + line.token(";", 1) + ";");
									--entries;
								}
								else
								{
									bool done = false;

											}
 
											if ( strs[j].empty() )
												continue;
											
											this->addBodies(section + ";" + strs[j] + ";");
											--entries;
										}
										//we must be at another section
										if ( !done )
										{
											section = line.token(";", 1);
											entries	= line.token(";", 2).toInt();
											line = line.remToken(";", 1);
											line = line.remToken(";", 1);
 
											if (line.empty())
												done = true;

						}
					}
					// animations
					else if ( special == 3 )
					{
						Utils::CStringList in;
						for ( int i = 0; i < iLines; i++ )
 
 
							in.pushBack(sLines[i]);
 
 
						Utils::CStringList out;
						if ( CXspFile::ReadAnimations(in, out, 87) )
							this->addAnimation(out);
					}
				}
				CLEANSPLIT(sLines, iLines)
				delete newFile;
			}
		}
		else if ( first.Compare("Script") )
		{
			Utils::String file = rest.words(3);
			C_File *newFile= this->addFile(file, Utils::String::Null(), FILETYPE_SCRIPT);
			newFile->SetCreationTime((long)rest.word(1));
			newFile->ReadFromData((char *)(compr + pos), rest.word(2));
 
			start += (newFile->GetDataSize() + 1);
		}

}
 
void CXspFile::clearCutData()
{
	_lCutData.clear();
}
void CXspFile::clearAnimations()
{
	_lAnimations.clear();
}
void CXspFile::clearBodies()
{
	_lBodies.clear();
}
 
Utils::String CXspFile::GetShipClass()
{
	if ( !m_sData.empty() )

 
	if ( !m_sData.empty() )
	{
		list->pushBack("# Ship Data, the TShip data entry to add to the game (parts of this are adjusted and auto generated by the installer)");
		list->pushBack("ShipData: " + m_sData);
		list->pushBack("");
	}
 
	if ( m_lText.size() ) {
		list->pushBack("# 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::String("ShipText: ") + (long)node->Data()->iId + " " + node->Data()->sName + "|" + node->Data()->sDesc);
		}

 
	if ( this->m_lDummy.size() ) {
		list->pushBack("# 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("Dummy: " + node->Data()->sSection + " " + node->Data()->sData);
		}
		list->pushBack("");
	}
 
	if ( this->m_lCockpit.size() ) {
		list->pushBack("# Cockpit entries, each cockpit value with thier weapons mask");
		for(CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next()) {
			list->pushBack("Cockpit: " + node->Data()->sCockpit.token(";", 19) + " " + node->Data()->sCockpit);
			for(SWeaponMask *mask = node->Data()->lWeaponMask.First(); mask; mask = node->Data()->lWeaponMask.Next()) {

		}
 
		list->pushBack("");
	}
 
	if (!this->_lCutData.empty())
	{
		list->pushBack("# Ship Cut Data");
		for(auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)
			list->pushBack("CutData: " + (*itr)->str);
		list->pushBack("");
	}
 
	if (!this->_lBodies.empty())
	{
		list->pushBack("# Ship Bodies");
		for(auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)
			list->pushBack("Bodies: "; + (*itr)->str);
 
		list->pushBack("");
	}
 
	if (!this->_lAnimations.empty())
	{
		list->pushBack("# Ship Animations");
		for (auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)
			list->pushBack("Animation: "; + (*itr)->str);	
 
		list->pushBack("");
	}
 
	if ( !datafile )
	{

		currentSubSection->sSection = section;
		list.push_back(currentSubSection);
	}
 
	currentSubSection->lEntries.pushBack(data, "");
 
 
 
 
 
 
 
 
 
 
 
 
 
}
 
void CXspFile::_addDataSection(Utils::CStringList& list, Utils::CList<STypesSection>& sectionList, bool bUseFirst)
{
	for(auto itr = list.begin(); itr != list.end(); itr++)

	_addDataSection(this->_lCutData, list, false);
}
 
void CXspFile::addBodiesToList(Utils::CList<STypesSection> &list)
{
	_addDataSection(this->_lBodies, list, true);
}
 
void CXspFile::addAnimationsToList(Utils::CList<STypesSection> &list)
{
	_addDataSection(this->_lAnimations, list, false);
}
 
 
void CXspFile::addGeneratedFiles(HZIP &hz)
{

				break;
			case 3:
				GENERATESECTION("Dummies", SDummy, this->m_lDummy);
				break;
			case 4:
				GENERATESTRINGSECTION("Bodies", this->_lBodies, true);
				break;
		}
 
		if ( type.empty() ) continue;
 

	else if ( sFirst.Compare("Dummy") )
		this->AddDummy(sRest.token(" ", 1), sRest.token(" ", 2));
	else if ( sFirst.Compare("CutData") )
		this->addCutData(sRest);
	else if ( sFirst.Compare("Animation") )
		this->addAnimation(sRest);
	else if ( sFirst.Compare("Bodies") )
		this->addBodies(sRest);
	else if ( !CBaseFile::LoadPackageData(sFirst, sRest, sMainGame, otherGames, gameAddons, progress) )
	{
		return false;
	}
 

	Utils::String data = m_sData;
 
	// change the ship subtype, Reunion uses number, TC uses a define
	Utils::String sSubType = data.token(";", 6);
	if ( !((long)sSubType) && sSubType != "0" )
		data = data.replaceToken(";", 6, (long)CShipData::ConvertShipSubType(sSubType));
 
	Utils::String sClass = data.token(";", TSHIPPOS_CLASS);
	if ( !((long)sClass) && sClass != "0" )
	{
		int num = 0;

{
	Utils::String data = m_sData;
 
	Utils::String sSubType = data.token(";", 6);
	if ( ((long)sSubType) || sSubType == "0" )
		data = data.replaceToken(";", 6, CShipData::ConvertShipSubType((long)sSubType));
 
	Utils::String sClass = data.token(";", TSHIPPOS_CLASS);
	if ( ((long)sClass) || sClass == "0" )
		data = data.replaceToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass((long)sClass));
 
	return data;
}
 
bool CXspFile::removeCockpit(const Utils::String &sCockpitId)
{
	Utils::String cockpitid = sCockpitId;
	// if its a whole line, just get the end
	if ( cockpitid.isin(";") )
	{

	m_lCockpit.RemoveEmpty();
 
	return ret;
}
 
bool CXspFile::removeComponent(const Utils::String &section1, const Utils::String &section2, const Utils::String &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) )

	}
	m_lComponent.RemoveEmpty();
	return ret;
}
 
bool CXspFile::removeDummy(const Utils::String &section, const Utils::String &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) )

	}
 
	return ret;
}
 
bool CXspFile::removeBodies(const Utils::String &cut)
{
	bool ret = false;
	for (auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)
	{
		if ((*itr)->str.remove(' ').Compare(cut.remove(' ')))
		{
 
			_lBodies.remove(itr);
			return true;
		}
	}
 
 
 
	return false;
}
 
bool CXspFile::removeAnimation(const Utils::String &cut)
{
 
	for(auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)
	{
		if ((*itr)->str.remove(' ').remove('\n').Compare(cut.remove(' ').remove('\n')))
		{
 
			_lAnimations.remove(itr);
			return true;
		}
	}
 
 
 
	return false;
}
 
SCockpit *CXspFile::_findCockpit(const Utils::String &sID)
{
	for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() ) {
		Utils::String id = node->Data()->sCockpit.token(";", 19);
		if ( id.Compare(sID) )
			return node->Data();
	}

	if ( game > 0 )
		AddCockpitWeapon(cid, game, mask);
	_changed();
}
 
void CXspFile::addBody(const Utils::String &section, const Utils::String &data)
{
	this->addBodies(section + ";" + data);
	_changed();
}
void CXspFile::addBodies(const Utils::String &sData)
{
	Utils::String 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) != ";" )
			data += ";";
	}
	if(!_lBodies.contains(data))
		_lBodies.pushBack(data);
	_changed();
}
 
void CXspFile::addCutData(const Utils::String& data)
{ 

				|| type.Compare("TAT_PINGPONG")
				|| type.Compare("TAT_TAGLOOP") )
		return TAT_3;
 
	return TAT_NONE;
}
 
Utils::String CXspFile::TypesListToString(Utils::CList<STypesSection> &list, bool deleteAfter)
{
	Utils::String data;
 
	for(Utils::CList<STypesSection>::iterator itr = list.begin(); itr != list.end(); itr++) {
		data += (*itr)->sSection + "; " + (long)(*itr)->lEntries.size() + ";\r\n";
		for(Utils::SStringList *str = (*itr)->lEntries.first(); str; str = (*itr)->lEntries.next()) {
			data += str->str + "\r\n";
		}
 
		if ( deleteAfter ) {
			(*itr)->lEntries.clear();
		}
	}
 
	return data;
}
 
bool CXspFile::ReadAnimations(const Utils::CStringList &lIn, Utils::CStringList &lOut, int startRecord)
{
	Utils::String lastComment;
	Utils::String addEntry;
	int remaining = 0;
	Utils::String lastType;
	int newEntries = 0;
	int entries = -1;
	for(auto itr = lIn.begin(); itr != lIn.end(); itr++)
	{
		Utils::String line = (*itr)->str;
		line.removeChar('\r');
		line.removeChar(9);
		if ( line.empty() || line[0] == '/' )
			continue;
		if ( entries == -1)

			{
				if ( entries <= newEntries && !addEntry.empty())
				{
					if ( addEntry[(int)addEntry.length() - 1] != ';' )
						addEntry += ";";
					lOut.pushBack(addEntry + lastComment);
				}
				--entries;
			}
		}
	}
 
	return !lOut.empty();
}
 
void CXspFile::addAnimation(const Utils::CStringList &list)
{
	for(auto itr = list.begin(); itr != list.end(); itr++)
		this->addAnimation((*itr)->str);
	_changed();
}
 
void CXspFile::addAnimation(const Utils::String& data) 
{ 
	if (!_lAnimations.contains(data))
	{
		_lAnimations.pushBack(data);
		_changed();
	}
}
 
SText *CXspFile::FindShipText(int lang)
{
	if ( m_lText.empty() )

	if ( t )
	{
		// return the correct language text
		if ( !t->sName.empty() )
			return t->sName;
		// we have found a text, but there is no ship name ??
		else if ( lang != 44 )
		{
			// reget the english one
			t = FindShipText(44);
			if ( t && !t->sName.empty() )

bool CXspFile::extractShip(CVirtualFileSystem *pVfs, const Utils::String &sId, CProgressInfo *progress)
{
	if ( !this->startExtractShip(pVfs, sId, progress) )
		return false;
 
	// read the scene file and get the files list
	if ( !this->processSceneFiles(pVfs, progress) )
		return false;
 
	// pack all the ship files
	this->PackAllFiles();
 
	return true;
}
 
bool CXspFile::extractSceneFiles(CVirtualFileSystem *pVfs)
{

	m_pCockpitFile = pVfs->extractGameFileToPackage(this, "objects\\" + m_sData.token(";", 18) + ".pbd", FILETYPE_COCKPITSCENE, "objects\\" + m_sData.token(";", 18) + ".bod");
 
	return true;
}
 
bool CXspFile::readSceneModels(Utils::CStringList& out)
{
	// read the scene file
	if (!m_pSceneFile)
		m_pSceneFile = this->GetFirstFile(FILETYPE_SHIPSCENE);
 
	if (!m_pSceneFile)
		return false;
 
	// check if its packed
	size_t datasize;
	unsigned char* data = m_pSceneFile->UncompressData((long*)&datasize, 0);
 
	// if data wasn't compressed, then copy it itself as we are editing it
	bool deleteData = false;
	if (data == m_pSceneFile->GetData())
	{
		data = new unsigned char[m_pSceneFile->GetDataSize()];
		memcpy(data, m_pSceneFile->GetData(), m_pSceneFile->GetDataSize());
		deleteData = true;
	}
 
	if (data && datasize)
	{
		if (m_pSceneFile->CheckPackedExtension())
			data = UnPCKData(data, datasize, &datasize);
	}
 
	if (!data || !datasize)
		return false;
 
 
 
	size_t pos = 0;
	bool newline = true;
	bool online = false;
	while (pos < datasize)
	{
		char c = data[pos];
		++pos;
 
		// skip until next line
		if (!newline && !online)
		{
			if (c == '\n')
				newline = true;
			continue;
		}
 
		if (newline)
		{
			if (c == ' ' || c == 9 || c == '\n' || c == '\r')
				continue;
 
			newline = false;
 
			if (c == 'P' || c == &apos;p')
			{
				while (data[pos] == ' ') pos++;
				unsigned char* line = (data + pos);
				while (data[pos] != &apos; ' && data[pos] != ';') pos++;
				data[pos] = '\0';
				if (atoi((const char*)line) == out.size())
					online = true;
			}
		}
		// this line is out model
		else if (online)
		{
			if (c == 'B' || c == &apos;b')
			{
				while (data[pos] == ' ') pos++;
				unsigned char* line = (data + pos);
				while (data[pos] != ';') pos++;
				data[pos] = '\0';
 
				out.pushBack((char*)line);
				online = false;
			}
		}
	}
 
	if (deleteData)
		delete data;
 
	return true;
}
 
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::String data = node->Data()->sData;
		int states = data.token(";", 3);
		for ( int i = 0; i < states; i++ ) {
			int cutid = data.token(";", (i * 2) + 5);
			if ( !cutid ) continue;

	if ( pVfs->ExtractGameFile("types/CutData.pck", CPackages::tempDirectory() + "tmp.dat").empty() ) return;
	
	CFileIO File(CPackages::tempDirectory() + "tmp.dat");
	if ( !File.exists() ) return;
	
	std::vector<Utils::String> lines;
	File.readLines(lines);
	int count = -1;
	for (auto itr = lines.begin(); itr != lines.end(); itr++) {
		Utils::String line = *itr;
		line.removeChar('\r');
		line.removeChar(' ');
		line.removeFirstSpace();
		if ( line[0] == '/' ) continue;
		if ( count == -1 ) count = line.token(";", 1);

					if ( !cutid ) continue;
					for ( std::vector<int>::iterator itr = cuts.begin(); itr != cuts.end(); itr++ ) {
						if ( (*itr) == cutid ) {
							this->addCutData(words[i] + ";" + words[i + 1] + ";");
							if ( add ) {
								sceneModels.pushBack(words[i + 1]);
							}
							break;
						}
					}
				}

			}
		}
	}
}
 
void CXspFile::extractDummies(CVirtualFileSystem *pVfs, Utils::CStringList& sceneModels, bool add)
{
	if (sceneModels.empty()) return;
 
	bool extracted = false;
	if ( !pVfs->ExtractGameFile("types/dummies.pck", CPackages::tempDirectory() + "tmp.dat").empty() ) {
		CFileIO File(CPackages::tempDirectory() + "tmp.dat");
		if ( File.exists() )
		{
			Utils::String section;
			int secCount = 0;
			std::vector<Utils::String> lines;
			if (File.readLines(lines))
			{
				for(auto itr = lines.begin(); itr != lines.end(); itr++)
				{
					Utils::String str = itr-&gt;remove(9).remove('\r');
					str.removeFirstSpace();
					if (str.empty())
						continue;
					if (str[0] == &apos;/')
						continue;
 
					// not in a section yet
					if (secCount <= 0)
					{
						section = str.token(";;", 1);
						secCount = str.token(";", 2).toInt();
					}
					else
					{
						Utils::String first = str.token(";;", 1);
						if (sceneModels.contains(first))
 
 
 
 
						{
 
							this-&gt;AddDummy(section, str);
 
							if (add)
							{
								int pos = 4;
								int scene = str.token(";", 3).toInt();
								for (int i = 0; i < scene; i++)
								{
									sceneModels.pushBack(str.token(";", 5 + (i * 2)));
									pos += 2;
								}
 
								int model = str.token(";", pos).toInt();
								for (int i = 0; i < model; i++)
									sceneModels.pushBack(str.token(";", pos + (i * 2) + 1));
							}
 
 
 
 
						}
						--secCount;
 
					}
 
 
				}
			}
 
 
			File.remove();
		}
	}
}
 
void CXspFile::extractComponants(CVirtualFileSystem *pVfs, const Utils::CStringList& sceneModels)
{
	if (sceneModels.empty()) return;
	if ( !pVfs->ExtractGameFile("types/components.pck", CPackages::tempDirectory() + "tmp.dat").empty() )
	{
		CFileIO File(CPackages::tempDirectory() + "tmp.dat");
		if ( File.exists() )
		{
			Utils::String file;
			Utils::String section;
			int secCount = 0;
			int secCount2 = 0;
			std::vector<Utils::String> lines;
			if (File.readLines(lines))
			{
				for(auto itr = lines.begin(); itr != lines.end(); itr++)
 
 
 
 
 
 
 
 
 
				{
					Utils::String str = itr->remove(9).remove('\r');
					str.removeFirstSpace();
					if (str.empty())
						continue;
					if (str[0] == '/')
						continue;
 
					// 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);
						secCount = str.token(";", 2).toInt();
					}
					else
					{
						file = str.token(";;", 1);
						secCount2 = str.token(";", 2).toInt();
						--secCount;
					}
				}
			}
 
 
			File.remove();
		}
	}
}
 
bool CXspFile::getTextureList(Utils::CStringList &list, const unsigned char *olddata, size_t size) const
{
	if ( !olddata || !size )
		return false;
 
	size_t startLine = 0;

						for(int i = 0; i < max; i++) {
							Utils::String type = strs[i].token(";", 1);
							Utils::String valtype = strs[i].token(";", 2);			
							if ( valtype.Compare("SPTYPE_STRING") ) {
								Utils::String file = strs[i].token(";", 3);
								if(!list.contains(file))
									list.pushBack(file, "");
							}
						}
					}
 
					CLEANSPLIT(strs, max)
				}
			}
 
			startLine = pos + 1;

	return true;
}
 
void CXspFile::extractTextures(CVirtualFileSystem *pVfs)
{
	Utils::CStringList lTextures;
 
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{
		C_File *f = node->Data();
		if ( f->GetFileType() != FILETYPE_SHIPMODEL )

				if ( !file.empty() ) {
					CFileIO File(file);
					if ( File.exists() ) {
						data = File.readAll(&size);
						File.remove();
					}
				}
 
				if ( data && size ) 
					this->getTextureList(lTextures, data, size);
				continue;
			}
 
			deleteData = true;
		}

			{
				data = f->GetData();
				size = f->GetDataSize();
			}
		}
		this->getTextureList(lTextures, data, size);
 
		if ( deleteData ) delete data;
	}
 
	for(auto itr = lTextures.begin(); itr != lTextures.end(); itr++)
	{
		CFileIO F((*itr)->str);
		if ( F.isFileExtension("fx") ) {
			/*
			if ( !pVfs->extractGameFileToPackage(this, "shader\\1_1\\" + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) )
				pVfs->extractGameFileToPackage(this, "shader\\1_1\\" + CFileIO(node->str.ToString()).ChangeFileExtension("fb").ToString(), FILETYPE_SHIPOTHER);
			if ( !pVfs->extractGameFileToPackage(this, "shader\\1_4\\" + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) )

			if ( !pVfs->extractGameFileToPackage(this, "shader\\3_0\\" + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) )
				pVfs->extractGameFileToPackage(this, "shader\\3_0\\" + CFileIO(node->str.ToString()).ChangeFileExtension("fb").ToString(), FILETYPE_SHIPOTHER);
				*/
		}
		else {
			if ( pVfs->extractGameFileToPackage(this, "dds\\" + (*itr)->str, FILETYPE_SHIPOTHER) )
				continue;
 
			if ( pVfs->extractGameFileToPackage(this, "dds\\" + (*itr)->str.token(".", -1), FILETYPE_SHIPOTHER) )
				continue;
 
			if ( pVfs->extractGameFileToPackage(this, "dds\\" + (*itr)->str + ".dds", FILETYPE_SHIPOTHER) )
				continue;
 
			if ( pVfs->extractGameFileToPackage(this, "dds\\" + Utils::String(F.changeFileExtension("dds")), FILETYPE_SHIPOTHER) )
				continue;
 
			if ( pVfs->extractGameFileToPackage(this, "textures\\" + (*itr)->str, FILETYPE_SHIPOTHER) )
				continue;
 
			if ( pVfs->extractGameFileToPackage(this, "textures\\" + (*itr)->str.token(".", -1), FILETYPE_SHIPOTHER) )
				continue;
 
			if ( pVfs->extractGameFileToPackage(this, "textures\\" + (*itr)->str + ".jpg", FILETYPE_SHIPOTHER) )
				continue;
 
			if ( pVfs->extractGameFileToPackage(this, "textures\\" + Utils::String(F.changeFileExtension("jpg")), FILETYPE_SHIPOTHER) )
				continue;
		}

 
	bool remove = false;
	if ( CFileIO(file).isFileExtension("pck") )
	{
		C_File F;
		F.setFilename(file);
		F.UnPCKFile();
		if (F.writeToFile(CPackages::tempDirectory() + "tmp.dat"))
		{
			remove = true;
			file = CPackages::tempDirectory() + "tmp.dat";

	}
 
	return false;
}
 
bool CXspFile::importBodies(const Utils::CStringList &sceneModels, const Utils::String &filename)
{
	CFileIO File(filename);
	if ( File.exists() )
	{
		Utils::String sSection;
		int section = 0;
		std::vector<Utils::String> lines;
		if (File.readLines(lines))
		{
 
 
 
 
 
 
 
 
			for(auto itr = lines.begin(); itr != lines.end(); itr++)
 
			{
				Utils::String l = *itr;
				l.removeChar(9);
				l.removeChar('\r');
				l.removeFirstSpace();
				if (l.empty())
					continue;
				if (l[0] == '/')
					continue;
 
				// are we looking for a section
				if (section <= 0)
				{
					sSection = l.token(";", 1);
					section = l.token(";", 2).toInt();
				}
				else
				{
					int max;
					Utils::String* strs = l.tokenise(";", &max);
					if (strs &amp;&; max)
					{
						for (int i = 0; i < max; i++)
						{
							strs[i].removeEndSpace();
							strs[i].removeFirstSpace();
							if (strs[i].empty())
								continue;
							if (sceneModels.contains(strs[i]))
								this->addBody(sSection, strs[i]);
							--section;
						}
					}
					CLEANSPLIT(strs, max)
				}
 
			}
			return true;
		}
 
 
	}
 
	return false;
}
 
bool CXspFile::ImportCockpits(const Utils::String &filename)
{
	CFileIO File(filename);
	if ( File.exists() )
	{
		std::vector<Utils::String> lines;
		if (File.readLines(lines))
 
		{
 
 
 
 
			int entries = 0;
 
			auto itr = lines.begin();
			while(itr != lines.end())
			{
				Utils::String str = itr->remove(9).remove('\r');
				str.removeFirstSpace();
				if (str.empty())
					itr = lines.erase(itr);
				else if (str[0] == '/')
					itr = lines.erase(itr);
				else if (!entries)
				{
					entries = str.token(";", 2).toInt();
					itr = lines.erase(itr);
				}
				else
					itr++;
			}
 
 
 
			// now get all the entries from TShips
			for (int i = 0; i <; 6; i++)
			{
				int idx = m_sData.token(";", 32 + (i * 2));
				if (static_cast<size_t>(idx) < lines.size() &amp;&amp; idx)
				{
					Utils::String turret = lines[idx];
					int pos = -1;
					Utils::String id;
					while (id.empty() &&; pos > -100) id = turret.token(";", pos--);
					m_sData = m_sData.replaceToken(";", 32 + (i * 2), id + "(" + (long)idx + ")");
 
					this->AddCockpit(turret, 0);
				}
			}
		}
 
 
		return true;
	}
	return false;
}
 

	}
 
	return false;
}
 
bool CXspFile::extractBodies(CVirtualFileSystem *pVfs, const Utils::CStringList &sceneModels)
{
	if (sceneModels.empty()) return false;
 
	if ( !pVfs->ExtractGameFile("types/Bodies.pck", CPackages::tempDirectory() + "tmp.dat").empty() ) {
		bool ret = this->importBodies(sceneModels, CPackages::tempDirectory() + "tmp.dat");
		CFileIO::Remove(CPackages::tempDirectory() + "tmp.dat");
 
		return ret;
	}
 

			CFileIO::Remove(CPackages::tempDirectory() + "/tmp.dat");
		}
	}
}
 
bool CXspFile::processSceneFileSection(int section, CVirtualFileSystem *pVfs, Utils::CStringList &lModels, CProgressInfo *progress)
{
	if ( progress ) progress->UpdateStatus(section);
 
	switch ( section )
	{
		case IMPORTSHIP_COMPONANT:
			if (lModels.empty()) return false;
			this->extractComponants(pVfs, lModels);
			break;
 
		case IMPORTSHIP_MODELS:
			{
				if (lModels.empty()) return false;
				for(auto itr = lModels.begin(); itr != lModels.end(); itr++)
				{
					if ((*itr)->str.isNumber() ) // count be componants or dummy
						continue;
					if ( pVfs->extractGameFileToPackage(this, "objects\\" + (*itr)->str + ".pbb&quot;, FILETYPE_SHIPMODEL, "objects\\" + (*itr)->str + ".bob") )
						continue;
					if ( pVfs->extractGameFileToPackage(this, "objects\\" + (*itr)->str + ".pbd&quot;, FILETYPE_SHIPMODEL, "objects\\" + (*itr)->str + ".bod") )
						continue;
				}
			}
			break;
 
		case IMPORTSHIP_DUMMIES:
			if (lModels.empty()) return false;
			this->extractDummies(pVfs, lModels, true);
			this->extractCutData(pVfs, lModels, true);
			break;
 
		// extract the textures

			pVfs->extractTexts(this, m_sData.token(";", 7));
			break;
 
		case IMPORTSHIP_BODIES:
			// extract the bodies entries
			if (lModels.empty()) return false;
			this->extractBodies(pVfs, lModels);
			break;
 
		case IMPORTSHIP_COCKPITS:
			// extract the cockpit entries

 
bool CXspFile::processSceneFiles(CVirtualFileSystem *pVfs, CProgressInfo *progress)
{
	// now lets parse our files
	if ( progress ) progress->UpdateStatus(IMPORTSHIP_EXTRACTSCENE);
	Utils::CStringList lModels;
	if(!readSceneModels(lModels))
		return false;
 
	// extract componants, and add extra items to list
	if ( !this->processSceneFileSection(IMPORTSHIP_COMPONANT, pVfs, lModels, progress) )
		return false;

		return false;
 
	// extract the cockpit entries
	if ( !this->processSceneFileSection(IMPORTSHIP_COCKPITS, pVfs, lModels, progress) )
		return false;
 
 
 
	return true;
}
 
 

				m_sData = m_sData.replaceToken(";", 32 + (i * 2), (id + "(" + Utils::String::Number(c->iIndex) + ")").c_str());
		}
	}
}
 
Utils::String CXspFile::formatShipData(const Utils::CStringList &cockpits, int *text, int game)
{
	Utils::String data = (game == GAME_X3) ? this->GetX3ShipData() : this->GetTCShipData();
	// do turrets
	for ( int t = 0; t < 6; t++ )
	{

			if ( turret.isin("(") )
			{
				oldPos = turret.tokens("(", 2).token(")", 1);
				turret = turret.token("(", 1);
			}
			int pos = cockpits.findPos(turret);
			if ( pos < 0 )	pos = oldPos;
			if (static_cast<size_t>(pos) >= cockpits.size()) pos = 0;
			data = data.replaceToken(";", 32 + (t * 2), (long)pos);
		}
	}
	// adjust the weapons
	int mask = this->GetLaserMask(game - 1);

Rev 165	Rev 170
Line 11...	Line 11...
11	`Utils::CList<STypesSection> list; \`	11	`Utils::CList<STypesSection> list; \`
12	`ADDSECTIONLIST(T, L); \`	12	`ADDSECTIONLIST(T, L); \`
13	`data = CXspFile::TypesListToString(list, true); \`	13	`data = CXspFile::TypesListToString(list, true); \`
14	`}`	14	`}`
15		15
16	`#define GENERATESTRINGSECTION(F, L, FIRST) if ( !L.Empty() ) { \`	16	`#define GENERATESTRINGSECTION(F, L, FIRST) if ( !L.empty() ) { \`
17	`type = F; \`	17	`type = F; \`
18	`Utils::CList<STypesSection> list; \`	18	`Utils::CList<STypesSection> list; \`
19	`_addDataSection(L, list, FIRST); \`	19	`_addDataSection(L, list, FIRST); \`
20	`data = CXspFile::TypesListToString(list, true); \`	20	`data = CXspFile::TypesListToString(list, true); \`
21	`}`	21	`}`
Line 41...	Line 41...
41	`for ( CListNode<SCockpit> *n = m_lCockpit.Front(); n; n = n->next() )`	41	`for ( CListNode<SCockpit> *n = m_lCockpit.Front(); n; n = n->next() )`
42	`n->Data()->lWeaponMask.MemoryClear();`	42	`n->Data()->lWeaponMask.MemoryClear();`
43	`m_lCockpit.MemoryClear();`	43	`m_lCockpit.MemoryClear();`
44	`m_lCockpit.destroy();`	44	`m_lCockpit.destroy();`
45	`_lCutData.clear();`	45	`_lCutData.clear();`
46	`m_lBodies.Clear();`	46	`_lBodies.clear();`
-		47	`_lAnimations.clear();`
47	`}`	48	`}`
48		49
49	`void CXspFile::SetDefaults ()`	50	`void CXspFile::SetDefaults ()`
50	`{`	51	`{`
51	`CBaseFile::SetDefaults ();`	52	`CBaseFile::SetDefaults ();`
Line 222...	Line 223...
222		223
223	`for ( CListNode<SWeaponMask> *wNode = m_lWeaponMasks.Front(); wNode; wNode = wNode->next() )`	224	`for ( CListNode<SWeaponMask> *wNode = m_lWeaponMasks.Front(); wNode; wNode = wNode->next() )`
224	`values += Utils::String("WeaponMask: ") + (long)wNode->Data()->iGame + " " + (long)wNode->Data()->iMask + "\n";`	225	`values += Utils::String("WeaponMask: ") + (long)wNode->Data()->iGame + " " + (long)wNode->Data()->iMask + "\n";`
225	`for ( CListNode<SWeaponMask> *mNode = m_lMissileMasks.Front(); mNode; mNode = mNode->next() )`	226	`for ( CListNode<SWeaponMask> *mNode = m_lMissileMasks.Front(); mNode; mNode = mNode->next() )`
226	`values += Utils::String("MissileMask: ") + (long)mNode->Data()->iGame + " " + (long)mNode->Data()->iMask + "\n";`	227	`values += Utils::String("MissileMask: ") + (long)mNode->Data()->iGame + " " + (long)mNode->Data()->iMask + "\n";`
227	`for(auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)`	228	`for (auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)`
228	`values += "CutData: " + (*itr)->str + "\n";`	229	`values += "CutData: " + (*itr)->str + "\n";`
229	`for ( SStringList *body = m_lBodies.Head(); body; body = body->;next )`	230	`for (auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)`
230	`values += Utils::String("Bodies: ";) + body->str.ToString() + "\n";`	231	`values += "Bodies: "; + (*itr)->str + "\n";`
231	`for ( SStringList *ani = m_lAnimations.Head(); ani; ani = ani->;next )`	232	`for (auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)`
232	`values += Utils::String("Animations: ";) + ani->str.ToString() + "\n";`	233	`values += "Animations: "; + (*itr)->str + "\n";`
233		234
234	`return values;`	235	`return values;`
235	`}`	236	`}`
236		237
237	`bool CXspFile::ParseValueLine(const Utils::String &sLine)`	238	`bool CXspFile::ParseValueLine(const Utils::String &sLine)`
Line 252...	Line 253...
252	`else if ( first.Compare("Shipyard") )`	253	`else if ( first.Compare("Shipyard") )`
253	`m_iShipyard = rest;`	254	`m_iShipyard = rest;`
254	`else if ( first.Compare("CutData") )`	255	`else if ( first.Compare("CutData") )`
255	`this->addCutData(rest);`	256	`this->addCutData(rest);`
256	`else if ( first.Compare("Bodies") )`	257	`else if ( first.Compare("Bodies") )`
257	`this->AddBodies(rest);`	258	`this->addBodies(rest);`
258	`else if ( first.Compare("Animations") )`	259	`else if ( first.Compare("Animations") )`
259	`this->AddAnimation(rest);`	260	`this->addAnimation(rest);`
260	`else if ( first.Compare("Cockpit") )`	261	`else if ( first.Compare("Cockpit") )`
261	`this->AddCockpit(rest, 0);`	262	`this->AddCockpit(rest, 0);`
262	`else if ( first.Compare("CockpitNew") )`	263	`else if ( first.Compare("CockpitNew") )`
263	`{`	264	`{`
264	`Utils::String cockpit = rest.tokens(" ", 2);`	265	`Utils::String cockpit = rest.tokens(" ", 2);`
Line 325...	Line 326...
325	`}`	326	`}`
326	`}`	327	`}`
327	`}`	328	`}`
328		329
329	`if ( name.empty() )`	330	`if ( name.empty() )`
330	`name = GetLanguageName(lang).ToString();`	331	`name = getLanguageName(lang);`
331		332
332	`return name;`	333	`return name;`
333	`}`	334	`}`
334		335
335	`//TODO: split this up`	336	`//TODO: split this up`
Line 399...	Line 400...
399	`else if ( first.Compare("ScreenShot") )`	400	`else if ( first.Compare("ScreenShot") )`
400	`{`	401	`{`
401	`int size = rest.token(" ", 1);`	402	`int size = rest.token(" ", 1);`
402	`Utils::String ext = rest.token(" ", 2);`	403	`Utils::String ext = rest.token(" ", 2);`
403		404
404	`C_File *newFile = this->AddFile(m_sID + "_" + (long)(this->CountFiles(FILETYPE_SCREEN) + 1) + "." + ext, "", FILETYPE_SCREEN);`	405	`C_File *newFile = this->addFile(m_sID + "_" + (long)(this->countFiles(FILETYPE_SCREEN) + 1) + "." + ext, "", FILETYPE_SCREEN);`
405	`newFile->ReadFromData((char *)(compr + pos), size);`	406	`newFile->ReadFromData((char *)(compr + pos), size);`
406		407
407	`start += (size + 1);`	408	`start += (size + 1);`
408	`}`	409	`}`
409	`else if ( first.Compare("SceneFile") )`	410	`else if ( first.Compare("SceneFile") )`
410	`{`	411	`{`
411	`Utils::String file = rest.tokens(" ", 3);`	412	`Utils::String file = rest.tokens(" ", 3);`
412	`m_pSceneFile = this->AddFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_SHIPSCENE);`	413	`m_pSceneFile = this->addFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_SHIPSCENE);`
413	`m_pSceneFile->SetCreationTime((long)rest.token(" ", 1));`	414	`m_pSceneFile->SetCreationTime((long)rest.token(" ", 1));`
414	`m_pSceneFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`	415	`m_pSceneFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`
415		416
416	`start += m_pSceneFile->GetDataSize();`	417	`start += m_pSceneFile->GetDataSize();`
417	`}`	418	`}`
418	`else if ( first.Compare("CockpitFile") )`	419	`else if ( first.Compare("CockpitFile") )`
419	`{`	420	`{`
420	`Utils::String file = rest.tokens(" ", 3);`	421	`Utils::String file = rest.tokens(" ", 3);`
421	`m_pCockpitFile = this->AddFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_COCKPITSCENE);`	422	`m_pCockpitFile = this->addFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_COCKPITSCENE);`
422	`m_pCockpitFile->SetCreationTime((long)rest.token(" ", 1));`	423	`m_pCockpitFile->SetCreationTime((long)rest.token(" ", 1));`
423	`m_pCockpitFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`	424	`m_pCockpitFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`
424		425
425	`start += m_pCockpitFile->GetDataSize();`	426	`start += m_pCockpitFile->GetDataSize();`
426	`}`	427	`}`
427	`else if ( first.Compare("Model") )`	428	`else if ( first.Compare("Model") )`
428	`{`	429	`{`
429	`Utils::String file = rest.tokens(" ", 3);`	430	`Utils::String file = rest.tokens(" ", 3);`
430	`C_File *newFile= this->AddFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_SHIPMODEL);`	431	`C_File *newFile= this->addFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_SHIPMODEL);`
431	`newFile->SetCreationTime((long)rest.token(" ", 1));`	432	`newFile->SetCreationTime((long)rest.token(" ", 1));`
432	`newFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`	433	`newFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`
433		434
434	`start += (newFile->GetDataSize() + 1);`	435	`start += (newFile->GetDataSize() + 1);`
435	`}`	436	`}`
Line 454...	Line 455...
454	`newFile = new C_File(file);`	455	`newFile = new C_File(file);`
455	`special = 3;`	456	`special = 3;`
456	`}`	457	`}`
457	`else`	458	`else`
458	`{`	459	`{`
459	`newFile = this->AddFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_SHIPOTHER);`	460	`newFile = this->addFile(CFileIO(file).filename(), CFileIO(file).dir(), FILETYPE_SHIPOTHER);`
460	`newFile->SetCreationTime((long)rest.token(" ", 1));`	461	`newFile->SetCreationTime((long)rest.token(" ", 1));`
461	`}`	462	`}`
462	`newFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`	463	`newFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`
463	`start += (newFile->GetDataSize() + 1);`	464	`start += (newFile->GetDataSize() + 1);`
464		465
Line 466...	Line 467...
466	`{`	467	`{`
467	`if ( newFile->CheckFileExt("pck") )`	468	`if ( newFile->CheckFileExt("pck") )`
468	`newFile->UnPCKFile();`	469	`newFile->UnPCKFile();`
469		470
470	`// read data into lines`	471	`// read data into lines`
471	`CyString data((const char *)newFile->GetData());`	472	`Utils::String data((const char *)newFile->GetData());`
472	`data.RemoveChar('\r');`	473	`data.removeChar('\r');`
473	`int iLines;`	474	`int iLines;`
474	`CyString *sLines = data.SplitToken("\n", &iLines);`	475	`Utils::String *sLines = data.tokenise("\n", &iLines);`
475		476
476	`if ( sLines && iLines )`	477	`if ( sLines && iLines )`
477	`{`	478	`{`
478	`// cut data`	479	`// cut data`
479	`int entries = -1;`	480	`size_t entries = -1;`
480	`if ( special == 1 )`	481	`if ( special == 1 )`
481	`{`	482	`{`
482	`CyStringList newLines;`	483	`Utils::CStringList newLines;`
483	`for ( int i = 0; i < iLines; i++ )`	484	`for ( int i = 0; i < iLines; i++ )`
484	`{`	485	`{`
485	`CyString line = sLines[i];`	486	`Utils::String line = sLines[i];`
486	`line.RemoveChar(' ');`	487	`line.removeChar(' ');`
487	`line.RemoveChar(9);`	488	`line.removeChar(9);`
488	`if ( line.Empty() \|\| line[0] == '/' )`	489	`if ( line.empty() \|\| line[0] == '/' )`
489	`continue;`	490	`continue;`
490	`if ( entries == -1 )`	491	`if ( entries == -1 )`
491	`{`	492	`{`
492	`entries = line.GetToken(";", 1, 1).ToInt() - 36;`	493	`entries = line.token(";", 1).toInt() - 36;`
493	`if ( entries <= 0 )`	494	`if ( entries <= 0 )`
494	`break;`	495	`break;`
495	`}`	496	`}`
496	`else`	497	`else`
497	`{`	498	`{`
498	`int id = line.GetToken(";", 1, 1).ToInt();`	499	`int id = line.token(";", 1).toInt();`
499	`if ( id >= 9000 && id <= 9017 )`	500	`if ( id >= 9000 && id <= 9017 )`
500	`continue;`	501	`continue;`
501		502
502	`switch (id)`	503	`switch (id)`
503	`{`	504	`{`
Line 520...	Line 521...
520	`case 4207:`	521	`case 4207:`
521	`case 4107:`	522	`case 4107:`
522	`break;`	523	`break;`
523		524
524	`default:`	525	`default:`
525	`newLines.PushBack(line);`	526	`newLines.pushBack(line);`
526	`}`	527	`}`
527	`if ( newLines.Count() == entries )`	528	`if ( newLines.size() == entries )`
528	`break;`	529	`break;`
529	`}`	530	`}`
530	`}`	531	`}`
531		532
532	`for ( SStringList *strNode = newLines.Head(); strNode; strNode = strNode->;next )`	533	`for(auto itr = newLines.begin(); itr != newLines.end(); itr++)`
533	`this->addCutData(strNode->str.ToString());`	534	`this->addCutData((*itr)->str);`
534	`}`	535	`}`
535	`// bodies`	536	`// bodies`
536	`else if ( special == 2 )`	537	`else if ( special == 2 )`
537	`{`	538	`{`
538	`entries = 0;`	539	`entries = 0;`
539	`Utils::String section;`	540	`Utils::String section;`
540	`for ( int i = 0; i < iLines; i++ )`	541	`for ( int i = 0; i < iLines; i++ )`
541	`{`	542	`{`
542	`Utils::String line = sLines[i].ToString();`	543	`Utils::String line = sLines[i];`
543	`line.removeChar(' ');`	544	`line.removeChar(' ');`
544	`line.removeChar(9);`	545	`line.removeChar(9);`
545	`if ( line.empty() \|\| line[0] == '/' )`	546	`if ( line.empty() \|\| line[0] == '/' )`
546	`continue;`	547	`continue;`
547	`if ( entries <= 0)`	548	`if ( entries <= 0)`
548	`{`	549	`{`
549	`section = line.token(";", 1);`	550	`section = line.token(";", 1);`
550	`entries = line.token(";", 2);`	551	`entries = line.token(";", 2).toInt();`
551	`}`	552	`}`
552	`else`	553	`else`
553	`{`	554	`{`
554	`if ( !line.isin(";") )`	555	`if ( !line.isin(";") )`
555	`continue;`	556	`continue;`
556	`if ( line.countToken(";") <= 2 )`	557	`if ( line.countToken(";") <= 2 )`
557	`{`	558	`{`
558	`this->AddBodies(section + ";" + line.token(";", 1) + ";");`	559	`this->addBodies(section + ";" + line.token(";", 1) + ";");`
559	`--entries;`	560	`--entries;`
560	`}`	561	`}`
561	`else`	562	`else`
562	`{`	563	`{`
563	`bool done = false;`	564	`bool done = false;`
Line 577...	Line 578...
577	`}`	578	`}`
578		579
579	`if ( strs[j].empty() )`	580	`if ( strs[j].empty() )`
580	`continue;`	581	`continue;`
581		582
582	`this->AddBodies(section + ";" + strs[j] + ";");`	583	`this->addBodies(section + ";" + strs[j] + ";");`
583	`--entries;`	584	`--entries;`
584	`}`	585	`}`
585	`//we must be at another section`	586	`//we must be at another section`
586	`if ( !done )`	587	`if ( !done )`
587	`{`	588	`{`
588	`section = line.token(";", 1);`	589	`section = line.token(";", 1);`
589	`entries = line.token(";", 2);`	590	`entries = line.token(";", 2).toInt();`
590	`line = line.remToken(";", 1);`	591	`line = line.remToken(";", 1);`
591	`line = line.remToken(";", 1);`	592	`line = line.remToken(";", 1);`
592		593
593	`if (line.empty())`	594	`if (line.empty())`
594	`done = true;`	595	`done = true;`
Line 601...	Line 602...
601	`}`	602	`}`
602	`}`	603	`}`
603	`// animations`	604	`// animations`
604	`else if ( special == 3 )`	605	`else if ( special == 3 )`
605	`{`	606	`{`
606	`CyStringList in;`	607	`Utils::CStringList in;`
607	`for ( int i = 0; i < iLines; i++ )`	608	`for ( int i = 0; i < iLines; i++ )`
608	`{`	-
609	`CyString line = sLines[i];`	-
610	`in.PushBack(line);`	609	`in.pushBack(sLines[i]);`
611	`}`	-
612		610
613	`CyStringList out;`	611	`Utils::CStringList out;`
614	`if ( CXspFile::ReadAnimations(&in, &out, 87) )`	612	`if ( CXspFile::ReadAnimations(in, out, 87) )`
615	`this->AddAnimation(&out);`	613	`this->addAnimation(out);`
616	`}`	614	`}`
617	`}`	615	`}`
618	`CLEANSPLIT(sLines, iLines)`	616	`CLEANSPLIT(sLines, iLines)`
619	`delete newFile;`	617	`delete newFile;`
620	`}`	618	`}`
621	`}`	619	`}`
622	`else if ( first.Compare("Script") )`	620	`else if ( first.Compare("Script") )`
623	`{`	621	`{`
624	`Utils::String file = rest.words(3);`	622	`Utils::String file = rest.words(3);`
625	`C_File *newFile= this->AddFile(file, NullString, FILETYPE_SCRIPT);`	623	`C_File *newFile= this->addFile(file, Utils::String::Null(), FILETYPE_SCRIPT);`
626	`newFile->SetCreationTime((long)rest.word(1));`	624	`newFile->SetCreationTime((long)rest.word(1));`
627	`newFile->ReadFromData((char *)(compr + pos), rest.word(2));`	625	`newFile->ReadFromData((char *)(compr + pos), rest.word(2));`
628		626
629	`start += (newFile->GetDataSize() + 1);`	627	`start += (newFile->GetDataSize() + 1);`
630	`}`	628	`}`
Line 763...	Line 761...
763	`}`	761	`}`
764		762
765	`void CXspFile::clearCutData()`	763	`void CXspFile::clearCutData()`
766	`{`	764	`{`
767	`_lCutData.clear();`	765	`_lCutData.clear();`
-		766	`}`
-		767	`void CXspFile::clearAnimations()`
-		768	`{`
-		769	`_lAnimations.clear();`
-		770	`}`
-		771	`void CXspFile::clearBodies()`
-		772	`{`
-		773	`_lBodies.clear();`
768	`}`	774	`}`
769		775
770	`Utils::String CXspFile::GetShipClass()`	776	`Utils::String CXspFile::GetShipClass()`
771	`{`	777	`{`
772	`if ( !m_sData.empty() )`	778	`if ( !m_sData.empty() )`
Line 816...	Line 822...
816		822
817	`if ( !m_sData.empty() )`	823	`if ( !m_sData.empty() )`
818	`{`	824	`{`
819	`list->pushBack("# Ship Data, the TShip data entry to add to the game (parts of this are adjusted and auto generated by the installer)");`	825	`list->pushBack("# Ship Data, the TShip data entry to add to the game (parts of this are adjusted and auto generated by the installer)");`
820	`list->pushBack("ShipData: " + m_sData);`	826	`list->pushBack("ShipData: " + m_sData);`
821	`list->pushBack("");`	827	`list->pushBack("");`
822	`}`	828	`}`
823		829
824	`if ( m_lText.size() ) {`	830	`if ( m_lText.size() ) {`
825	`list->pushBack("# Ship Texts, the name/description of the ship in each language: <LANGID> <NAME>\|<DESCRIPTION>");`	831	`list->pushBack("# Ship Texts, the name/description of the ship in each language: <LANGID> <NAME>\|<DESCRIPTION>");`
826	`for(CListNode<SText> *node = m_lText.Front(); node; node = node->next()) {`	832	`for(CListNode<SText> *node = m_lText.Front(); node; node = node->next()) {`
827	`list->pushBack(Utils::String("ShipText: ") + (long)node->Data()->iId + " " + node->Data()->sName + "\|" + node->Data()->sDesc);`	833	`list->pushBack(Utils::String("ShipText: ") + (long)node->Data()->iId + " " + node->Data()->sName + "\|" + node->Data()->sDesc);`
828	`}`	834	`}`
Line 858...	Line 864...
858		864
859	`if ( this->m_lDummy.size() ) {`	865	`if ( this->m_lDummy.size() ) {`
860	`list->pushBack("# Ship Dummies, each dummy entry used in the ships scene: <SECTION> <VALUE>");`	866	`list->pushBack("# Ship Dummies, each dummy entry used in the ships scene: <SECTION> <VALUE>");`
861	`for(CListNode<SDummy> *node = m_lDummy.Front(); node; node = node->next()) {`	867	`for(CListNode<SDummy> *node = m_lDummy.Front(); node; node = node->next()) {`
862	`list->pushBack("Dummy: " + node->Data()->sSection + " " + node->Data()->sData);`	868	`list->pushBack("Dummy: " + node->Data()->sSection + " " + node->Data()->sData);`
863	`}`	869	`}`
864	`list->pushBack("");`	870	`list->pushBack("");`
865	`}`	871	`}`
866		872
867	`if ( this->m_lCockpit.size() ) {`	873	`if ( this->m_lCockpit.size() ) {`
868	`list->pushBack("# Cockpit entries, each cockpit value with thier weapons mask");`	874	`list->pushBack("# Cockpit entries, each cockpit value with thier weapons mask");`
869	`for(CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next()) {`	875	`for(CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next()) {`
870	`list->pushBack("Cockpit: " + node->Data()->sCockpit.token(";", 19) + " " + node->Data()->sCockpit);`	876	`list->pushBack("Cockpit: " + node->Data()->sCockpit.token(";", 19) + " " + node->Data()->sCockpit);`
871	`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()) {`
Line 874...	Line 880...
874	`}`	880	`}`
875		881
876	`list->pushBack("");`	882	`list->pushBack("");`
877	`}`	883	`}`
878		884
879	`if ( !this->_lCutData.empty() ) {`	885	`if (!this->_lCutData.empty())`
-		886	`{`
880	`list->pushBack("# Ship Cut Data");`	887	`list->pushBack("# Ship Cut Data");`
881	`for(auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)`	888	`for(auto itr = _lCutData.begin(); itr != _lCutData.end(); itr++)`
882	`list->pushBack("CutData: " + (*itr)->str);`	889	`list->pushBack("CutData: " + (*itr)->str);`
883	`list->pushBack("");`	890	`list->pushBack("");`
884	`}`	891	`}`
885		892
886	`if ( !this->m_lBodies.Empty() ) {`	893	`if (!this->_lBodies.empty())`
-		894	`{`
887	`list->pushBack("# Ship Bodies");`	895	`list->pushBack("# Ship Bodies");`
888	`for(SStringList *str = m_lBodies.Head(); str; str = str->;next) {`	896	`for(auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)`
889	`list->pushBack(Utils::String("Bodies: ";) + str->str.ToString());`	897	`list->pushBack("Bodies: "; + (*itr)->str);`
890	`}`	-
891	`list->pushBack("");`	898	`list->pushBack("");`
892	`}`	899	`}`
893		900
894	`if ( !this->m_lAnimations.Empty() ) {`	901	`if (!this->_lAnimations.empty())`
-		902	`{`
895	`list->pushBack("# Ship Animations");`	903	`list->pushBack("# Ship Animations");`
896	`for(SStringList *str = m_lAnimations.Head(); str; str = str->next) {`	904	`for (auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)`
897	`list->pushBack(Utils::String("Animation: ";) + str->str.ToString());`	905	`list->pushBack("Animation: "; + (*itr)->str);`
898	`}`	-
899	`list->pushBack("");`	906	`list->pushBack("");`
900	`}`	907	`}`
901		908
902	`if ( !datafile )`	909	`if ( !datafile )`
903	`{`	910	`{`
Line 923...	Line 930...
923	`currentSubSection->sSection = section;`	930	`currentSubSection->sSection = section;`
924	`list.push_back(currentSubSection);`	931	`list.push_back(currentSubSection);`
925	`}`	932	`}`
926		933
927	`currentSubSection->lEntries.pushBack(data, "");`	934	`currentSubSection->lEntries.pushBack(data, "");`
928	`}`	-
929		-
930	`void CXspFile::_addDataSection(CyStringList& list, Utils::CList<STypesSection>& sectionList, bool bUseFirst)`	-
931	`{`	-
932	`for (SStringList* str = list.Head(); str; str = str->next) {`	-
933	`if (bUseFirst) {`	-
934	`Utils::String data = str->str.ToString();`	-
935	`_addSection(sectionList, data.token(";", 1), data.tokens(";", 2));`	-
936	`}`	-
937	`else {`	-
938	`_addSection(sectionList, str->str.ToString(), str->data.ToString());`	-
939	`}`	-
940	`}`	-
941	`}`	935	`}`
942		936
943	`void CXspFile::_addDataSection(Utils::CStringList& list, Utils::CList<STypesSection>& sectionList, bool bUseFirst)`	937	`void CXspFile::_addDataSection(Utils::CStringList& list, Utils::CList<STypesSection>& sectionList, bool bUseFirst)`
944	`{`	938	`{`
945	`for(auto itr = list.begin(); itr != list.end(); itr++)`	939	`for(auto itr = list.begin(); itr != list.end(); itr++)`
Line 985...	Line 979...
985	`_addDataSection(this->_lCutData, list, false);`	979	`_addDataSection(this->_lCutData, list, false);`
986	`}`	980	`}`
987		981
988	`void CXspFile::addBodiesToList(Utils::CList<STypesSection> &list)`	982	`void CXspFile::addBodiesToList(Utils::CList<STypesSection> &list)`
989	`{`	983	`{`
990	`_addDataSection(this->m_lBodies, list, true);`	984	`_addDataSection(this->_lBodies, list, true);`
991	`}`	985	`}`
992		986
993	`void CXspFile::addAnimationsToList(Utils::CList<STypesSection> &list)`	987	`void CXspFile::addAnimationsToList(Utils::CList<STypesSection> &list)`
994	`{`	988	`{`
995	`_addDataSection(this->m_lAnimations, list, false);`	989	`_addDataSection(this->_lAnimations, list, false);`
996	`}`	990	`}`
997		991
998		992
999	`void CXspFile::addGeneratedFiles(HZIP &hz)`	993	`void CXspFile::addGeneratedFiles(HZIP &hz)`
1000	`{`	994	`{`
Line 1032...	Line 1026...
1032	`break;`	1026	`break;`
1033	`case 3:`	1027	`case 3:`
1034	`GENERATESECTION("Dummies", SDummy, this->m_lDummy);`	1028	`GENERATESECTION("Dummies", SDummy, this->m_lDummy);`
1035	`break;`	1029	`break;`
1036	`case 4:`	1030	`case 4:`
1037	`GENERATESTRINGSECTION("Bodies", this->m_lBodies, true);`	1031	`GENERATESTRINGSECTION("Bodies", this->_lBodies, true);`
1038	`break;`	1032	`break;`
1039	`}`	1033	`}`
1040		1034
1041	`if ( type.empty() ) continue;`	1035	`if ( type.empty() ) continue;`
1042		1036
Line 1100...	Line 1094...
1100	`else if ( sFirst.Compare("Dummy") )`	1094	`else if ( sFirst.Compare("Dummy") )`
1101	`this->AddDummy(sRest.token(" ", 1), sRest.token(" ", 2));`	1095	`this->AddDummy(sRest.token(" ", 1), sRest.token(" ", 2));`
1102	`else if ( sFirst.Compare("CutData") )`	1096	`else if ( sFirst.Compare("CutData") )`
1103	`this->addCutData(sRest);`	1097	`this->addCutData(sRest);`
1104	`else if ( sFirst.Compare("Animation") )`	1098	`else if ( sFirst.Compare("Animation") )`
1105	`this->AddAnimation(sRest);`	1099	`this->addAnimation(sRest);`
1106	`else if ( sFirst.Compare("Bodies") )`	1100	`else if ( sFirst.Compare("Bodies") )`
1107	`this->AddBodies(sRest);`	1101	`this->addBodies(sRest);`
1108	`else if ( !CBaseFile::LoadPackageData(sFirst, sRest, sMainGame, otherGames, gameAddons, progress) )`	1102	`else if ( !CBaseFile::LoadPackageData(sFirst, sRest, sMainGame, otherGames, gameAddons, progress) )`
1109	`{`	1103	`{`
1110	`return false;`	1104	`return false;`
1111	`}`	1105	`}`
1112		1106
Line 1119...	Line 1113...
1119	`Utils::String data = m_sData;`	1113	`Utils::String data = m_sData;`
1120		1114
1121	`// change the ship subtype, Reunion uses number, TC uses a define`	1115	`// change the ship subtype, Reunion uses number, TC uses a define`
1122	`Utils::String sSubType = data.token(";", 6);`	1116	`Utils::String sSubType = data.token(";", 6);`
1123	`if ( !((long)sSubType) && sSubType != "0" )`	1117	`if ( !((long)sSubType) && sSubType != "0" )`
1124	`data = data.replaceToken(";", 6, (long)CShipData::ConvertShipSubType(CyString(sSubType)));`	1118	`data = data.replaceToken(";", 6, (long)CShipData::ConvertShipSubType(sSubType));`
1125		1119
1126	`Utils::String sClass = data.token(";", TSHIPPOS_CLASS);`	1120	`Utils::String sClass = data.token(";", TSHIPPOS_CLASS);`
1127	`if ( !((long)sClass) && sClass != "0" )`	1121	`if ( !((long)sClass) && sClass != "0" )`
1128	`{`	1122	`{`
1129	`int num = 0;`	1123	`int num = 0;`
Line 1146...	Line 1140...
1146	`{`	1140	`{`
1147	`Utils::String data = m_sData;`	1141	`Utils::String data = m_sData;`
1148		1142
1149	`Utils::String sSubType = data.token(";", 6);`	1143	`Utils::String sSubType = data.token(";", 6);`
1150	`if ( ((long)sSubType) \|\| sSubType == "0" )`	1144	`if ( ((long)sSubType) \|\| sSubType == "0" )`
1151	`data = data.replaceToken(";", 6, CShipData::ConvertShipSubType((long)sSubType).ToString());`	1145	`data = data.replaceToken(";", 6, CShipData::ConvertShipSubType((long)sSubType));`
1152		1146
1153	`Utils::String sClass = data.token(";", TSHIPPOS_CLASS);`	1147	`Utils::String sClass = data.token(";", TSHIPPOS_CLASS);`
1154	`if ( ((long)sClass) \|\| sClass == "0" )`	1148	`if ( ((long)sClass) \|\| sClass == "0" )`
1155	`data = data.replaceToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass((long)sClass));`	1149	`data = data.replaceToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass((long)sClass));`
1156		1150
1157	`return data;`	1151	`return data;`
1158	`}`	1152	`}`
1159		1153
1160	`bool CXspFile::RemoveCockpit(const Utils::String &sCockpitId)`	1154	`bool CXspFile::removeCockpit(const Utils::String &sCockpitId)`
1161	`{`	1155	`{`
1162	`Utils::String cockpitid = sCockpitId;`	1156	`Utils::String cockpitid = sCockpitId;`
1163	`// if its a whole line, just get the end`	1157	`// if its a whole line, just get the end`
1164	`if ( cockpitid.isin(";") )`	1158	`if ( cockpitid.isin(";") )`
1165	`{`	1159	`{`
Line 1183...	Line 1177...
1183	`m_lCockpit.RemoveEmpty();`	1177	`m_lCockpit.RemoveEmpty();`
1184		1178
1185	`return ret;`	1179	`return ret;`
1186	`}`	1180	`}`
1187		1181
1188	`bool CXspFile::RemoveComponent(const Utils::String &section1, const Utils::String &section2, const Utils::String &data)`	1182	`bool CXspFile::removeComponent(const Utils::String &section1, const Utils::String &section2, const Utils::String &data)`
1189	`{`	1183	`{`
1190	`bool ret = false;`	1184	`bool ret = false;`
1191	`for ( CListNode<SComponent> *node = m_lComponent.Front(); node; node = node->next() )`	1185	`for ( CListNode<SComponent> *node = m_lComponent.Front(); node; node = node->next() )`
1192	`{`	1186	`{`
1193	`if ( node->Data()->sSection.Compare(section1) && node->Data()->sSection2.Compare(section2) && node->Data()->sData.Compare(data) )`	1187	`if ( node->Data()->sSection.Compare(section1) && node->Data()->sSection2.Compare(section2) && node->Data()->sData.Compare(data) )`
Line 1199...	Line 1193...
1199	`}`	1193	`}`
1200	`m_lComponent.RemoveEmpty();`	1194	`m_lComponent.RemoveEmpty();`
1201	`return ret;`	1195	`return ret;`
1202	`}`	1196	`}`
1203		1197
1204	`bool CXspFile::RemoveDummy(const Utils::String &section, const Utils::String &data)`	1198	`bool CXspFile::removeDummy(const Utils::String &section, const Utils::String &data)`
1205	`{`	1199	`{`
1206	`bool ret = false;`	1200	`bool ret = false;`
1207	`for ( CListNode<SDummy> *node = m_lDummy.Front(); node; node = node->next() )`	1201	`for ( CListNode<SDummy> *node = m_lDummy.Front(); node; node = node->next() )`
1208	`{`	1202	`{`
1209	`if ( node->Data()->sSection.Compare(section) && node->Data()->sData.Compare(data) )`	1203	`if ( node->Data()->sSection.Compare(section) && node->Data()->sData.Compare(data) )`
Line 1295...	Line 1289...
1295	`}`	1289	`}`
1296		1290
1297	`return ret;`	1291	`return ret;`
1298	`}`	1292	`}`
1299		1293
1300	`bool CXspFile::RemoveBodies(const Utils::String &cut)`	1294	`bool CXspFile::removeBodies(const Utils::String &cut)`
1301	`{`	1295	`{`
1302	`bool ret = false;`	1296	`bool ret = false;`
1303	`for ( SStringList *str = m_lBodies.Head(); str; str = str->;next )`	1297	`for (auto itr = _lBodies.begin(); itr != _lBodies.end(); itr++)`
1304	`{`	1298	`{`
1305	`if ( str->str.Remove(' ').Compare(CyString(cut.remove(' '))) )`	1299	`if ((*itr)->str.remove(' ').Compare(cut.remove(' ')))`
1306	`{`	1300	`{`
1307	`ret = true;`	-
1308	`str->remove = true;`	1301	`_lBodies.remove(itr);`
1309	`break;`	1302	`return true;`
1310	`}`	1303	`}`
1311	`}`	1304	`}`
1312		-
1313	`m_lBodies.RemoveMarked();`	-
1314		1305
1315	`return ret;`	1306	`return false;`
1316	`}`	1307	`}`
1317		1308
1318	`bool CXspFile::RemoveAnimation(const Utils::String &cut)`	1309	`bool CXspFile::removeAnimation(const Utils::String &cut)`
1319	`{`	1310	`{`
1320	`bool ret = false;`	-
1321	`for ( SStringList *str = m_lAnimations.Head(); str; str = str->;next )`	1311	`for(auto itr = _lAnimations.begin(); itr != _lAnimations.end(); itr++)`
1322	`{`	1312	`{`
1323	`if ( str->str.Remove(' ').Remove('\n').Compare(CyString(cut.remove(' ').remove('\n'))) )`	1313	`if ((*itr)->str.remove(' ').remove('\n').Compare(cut.remove(' ').remove('\n')))`
1324	`{`	1314	`{`
1325	`ret = true;`	-
1326	`str->remove = true;`	1315	`_lAnimations.remove(itr);`
1327	`break;`	1316	`return true;`
1328	`}`	1317	`}`
1329	`}`	1318	`}`
1330		1319
1331	`m_lAnimations.RemoveMarked();`	-
1332		-
1333	`return ret;`	1320	`return false;`
1334	`}`	1321	`}`
1335		1322

Subversion Repositories spk

(root)//libspk/src/XspFile.cpp – Rev 165 → 170