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



	m_iOrgDesc = 0;
 
	m_iShipyard = SHIPYARD_NONE;
}
 
void CXspFile::AddText ( int id, const Utils::String &name, const Utils::String &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::String &section, const Utils::String &data )
{
	SDummy *d = new SDummy;
	d->sData = data;
	d->sSection = section;
 
	if ( d->sData.right(1) != ";" )
		d->sData += ";";
 
	m_lDummy.push_back ( d );
 
	m_bChanged = true; 
}
 
void CXspFile::AddComponent ( const Utils::String &section, const Utils::String &section2, const Utils::String &data )
{
	SComponent *c = new SComponent;
	c->sData = data;
	c->sSection = section;
	c->sSection2 = section2;
 
	if ( c->sData.right(1) != ";" )
		c->sData += ";";
 
	m_lComponent.push_back ( c );
 
	m_bChanged = true; 

			values += (long)wNode->Data()->iGame;
			values += ":";
			values += (long)wNode->Data()->iMask;
		}
		values += " ";
		values += cockpit->sCockpit + "\n";
	}
 
	for ( CListNode<SText> *tNode = m_lText.Front(); tNode; tNode = tNode->next() )
		values += Utils::String("Text: ") + (long)tNode->Data()->iId + "|" + tNode->Data()->sName.findReplace("|", "<::PiPe::>") + "|" + tNode->;Data()->sDesc + "\n";
 
	for ( CListNode<SComponent> *cNode = m_lComponent.Front(); cNode; cNode = cNode->next() )
		values += "Component: &quot; + cNode->Data()->sData.findReplace("|", "<::PiPe::>") + "|" + cNode->;Data()->sSection.findReplace("|&quot;, "<::PiPe::>") + &quot;|"; + cNode->Data()->sSection2 + "\n";
 
	for ( CListNode<SDummy> *dNode = m_lDummy.Front(); dNode; dNode = dNode->next() )
		values += "Dummy: " + dNode->Data()->sData.findReplace("|", "&lt;::PiPe::>") + "|" + dNode->Data()->sSection + "\n";
 
	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";

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

		return CBaseFile::ParseValueLine(sLine);
 
	return true;
}
 
Utils::String CXspFile::GetShipName(int lang)
{
	Utils::String name;
	if ( (m_bLanguageText) && (lang) )
	{
		for ( SText *text = m_lText.First(); text; text = m_lText.Next() )
		{
			if ( text->iId == lang )

				break;
			}
		}
	}
 
	if ( name.empty() )
		name = GetLanguageName(lang).ToString();
 
	return name;
}
 
//TODO: split this up
bool CXspFile::ConvertOld(const Utils::String &file)
{
	// open the file
	FILE *id = fopen(file.c_str(), "rb");
	if ( !id )
		return false;

	while ( pos < len )
	{
		while ( compr[pos++] != '\n' && pos < len );
 
		compr[pos - 1] = '\0';
		Utils::String line = (char *)(compr + start);
		start = pos;
		if ( line.empty() )
			continue;
		Utils::String first = line.token(":", 1);
		Utils::String rest = line.tokens(":", 2);
		rest = rest.removeFirstSpace();
 
		// now check each line
		if ( first.Compare("Packager") )
			packageVersion = rest;
		else if ( first.Compare("Shipyard") )
		{
			int max;
			Utils::String *strs = rest.tokenise(";", &max);
			if ( strs && max )
			{
				int cur = 1;
				for ( int i = 0; i < max; i++, cur *= 2 )
				{

			}
			CLEANSPLIT(strs, max)
		}
		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).GetFilename(), CFileIO(file).GetDir(), 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).GetFilename(), CFileIO(file).GetDir(), 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).GetFilename(), CFileIO(file).GetDir(), FILETYPE_SHIPMODEL);
			newFile->SetCreationTime((long)rest.token(" ", 1));
			newFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));
 
			start += (newFile->GetDataSize() + 1);
		}
		else if ( first.Compare("Files") )
		{
			Utils::String file = rest.tokens(" ", 3);
 
			C_File *newFile = NULL;
			int special = 0;
			if ( file.Compare("types/CutData.txt") || file.Compare("types/CutData.pck") )
			{
				newFile = new C_File(CyString(file));
				special = 1;
			}
			else if ( file.Compare("types/Bodies.txt") || file.Compare("types/Bodies.pck") )
			{
				newFile = new C_File(CyString(file));
				special = 2;
			}
			else if ( file.Compare("types/Animations.txt") || file.Compare("types/Animations.pck") )
			{
				newFile = new C_File(CyString(file));
				special = 3;
			}
			else
			{
				newFile = this->AddFile(CFileIO(file).GetFilename(), CFileIO(file).GetDir(), FILETYPE_SHIPOTHER);
				newFile->SetCreationTime((long)rest.token(" ", 1));
			}
			newFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));
			start += (newFile->GetDataSize() + 1);
 
			if ( special )
			{
				if ( newFile->CheckFileExt("pck") )

									break;
							}
						}
 
						for ( SStringList *strNode = newLines.Head(); strNode; strNode = strNode->next )
							this->AddCutData(strNode->str.ToString());
					}
					// bodies
					else if ( special == 2 )
					{
						entries = 0;
						Utils::String section;
						for ( int i = 0; i < iLines; i++ )
						{
							Utils::String line = sLines[i].ToString();
							line.removeChar(' ');
							line.removeChar(9);
							if ( line.empty() || line[0] == '/' )
								continue;
							if ( entries <= 0)
							{
								section = line.token(";", 1);
								entries	= line.token(";", 2);
							}
							else
							{
								if ( !line.isin(";") )
									continue;
								if ( line.countToken(";") <= 2 )
								{
									this->AddBodies(section + ";" + line.token(";", 1) + ";");
									--entries;
								}
								else
								{
									bool done = false;
									while (!done)
									{
										int num;
										Utils::String *strs = line.tokenise(";", &num);
										done = true;
										for ( int j = 0; j < num; j++ )
										{
											if ( !entries )
											{
												line = line.tokens(";", j + 1);
												if ( !line.empty() )
													done = false;
												break;
											}
 
											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);
											line = line.remToken(";", 1);
											line = line.remToken(";", 1);
 
											if (line.empty())
												done = true;
										}
 
										CLEANSPLIT(strs, num)
									}									

				delete newFile;
			}
		}
		else if ( first.Compare("Script") )
		{
			Utils::String file = rest.words(3);
			C_File *newFile= this->AddFile(file, NullString, FILETYPE_SCRIPT);
			newFile->SetCreationTime((long)rest.word(1));
			newFile->ReadFromData((char *)(compr + pos), rest.word(2));
 
			start += (newFile->GetDataSize() + 1);
		}
		else if ( first.Compare("Text") )
			this->AddText(rest.token(":&quot;, 1), rest.token(":&quot;, 2), rest.tokens(":", 3));
		else if ( first.Compare("Component") )
			this->AddComponent(rest.token(";&quot;, 1), rest.token(";", 2), rest.tokens(";", 3));
		else if ( first.Compare("Dummy") )
		{
			SDummy *d = new SDummy;
			d->sData = rest.tokens(";;", 2);
			d->sSection = rest.token(";;", 1);
			m_lDummy.push_back ( d );
		}
		else if ( !this->ParseValueLine(line) )
		{
		//	printf ( "Command: %s, Rest: %s\n", first.c_str(), rest.c_str());
		}
 
		pos = start;
	}
 
	// assume all old ones are for X3
	if ( !m_sData.empty() )
	{
		this->AddWeaponMask(GAME_X3 - 1, m_sData.token(";", 19));
		this->AddMissileMask(GAME_X3 - 1, m_sData.token(";", 25));
	}
 
	return true;
}
 
 
int GetMaxShipyards() { return (int)SHIPYARD_MAX; }
 
Utils::String GetShipyardName (int s)
{
	switch (s)
	{
		case SHIPYARD_ARGON:
			return "Argon";

		case SHIPYARD_TERRAN:
			return "Terran";
	}
 
	return "Unknown";
}
 
bool CXspFile::WriteHeader(FILE *id, int valueheader, int valueComprLen)
{
	fprintf ( id, "XSPCycrow;%.2f;%d;%d\n", FILEVERSION, valueheader, valueComprLen );
	if ( ferror(id) )
		return false;
	return true;
}
 
bool CXspFile::CheckHeader(const Utils::String header) const
{
	if ( header.Compare("XSPCycrow") )
		return true;
	return false;
}
 
void CXspFile::SetLaserMask(int game, int mask)
{
	for ( CListNode<SWeaponMask> *node = m_lWeaponMasks.Front(); node; node = node->next() )
	{
		SWeaponMask *m = node->Data();
		if ( m->iGame == game )
		{
			m->iMask = mask;
			return;
		}
	}
 
	// no found, need to add it
	this->AddWeaponMask(game, mask);
}
 
void CXspFile::SetMissileMask(int game, int mask)
{

	}
 
	return mask;
}
 
Utils::String CXspFile::GetShipClass()
{
	if ( !m_sData.empty() )
		return m_sData.token(";", TSHIPPOS_CLASS);
	return "OBJ_SHIP_M5";
}

{
	if ( sFirst.Compare("Shipyard") )
	{
		for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )
		{
			if ( sRest.Compare(GetShipyardName(i)) )
			{
				this->AddShipyard(i);
				break;
			}
		}

 
	return true;
}
 
 
Utils::String CXspFile::GetX3ShipData()
{
	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(CyString(sSubType)));
 
	Utils::String sClass = data.token(";", TSHIPPOS_CLASS);
	if ( !((long)sClass) && sClass != "0" )
	{
		int num = 0;
		for ( int i = 0; i < OBJ_SHIP_MAX; i++ )
		{
			if ( sClass.Compare(CShipData::ConvertShipClass(CShipData::GetShipClassFromNum(i)).ToString()) )
			{
				num = i;
				break;
			}
		}
 
		data = data.replaceToken(";", TSHIPPOS_CLASS, (long)num);
	}
 
	return data;
}
 
Utils::String CXspFile::GetTCShipData()
{
	Utils::String data = m_sData;
 
	Utils::String sSubType = data.token(";", 6);
	if ( ((long)sSubType) || sSubType == "0" )
		data = data.replaceToken(";", 6, CShipData::ConvertShipSubType((long)sSubType).ToString());
 
	Utils::String sClass = data.token(";", TSHIPPOS_CLASS);
	if ( ((long)sClass) || sClass == "0" )
		data = data.replaceToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass((long)sClass).ToString());
 
	return data;
}
 
bool CXspFile::RemoveCockpit(const Utils::String &sCockpitId)
{
	Utils::String cockpitid = sCockpitId;
	// if its a whole line, just get the end
	if ( cockpitid.isin(";") )
	{
		cockpitid = cockpitid.tokens(";", -2);
		while ( cockpitid.right(1) == ";" )
			cockpitid.truncate(-1);
	}
 
	bool ret = false;
	for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )
	{
		Utils::String id = node->Data()->sCockpit.token(";", 19);
		if ( id.Compare(cockpitid) )
		{
			node->DeleteData();
			ret = true;
			break;

	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) )

	m_lDummy.RemoveEmpty();
 
	return ret;
}
 
Utils::String CXspFile::GetCockpitData(const Utils::String &cid)
{
	for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )
	{
		Utils::String id = node->Data()->sCockpit.token(";", 19);
		if ( id.Compare(cid) )
			return node->Data()->sCockpit;
	}
 
	return "";
}
 
SCockpit *CXspFile::FindCockpit(const Utils::String &cid)
{
	for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )
	{
		Utils::String id = node->Data()->sCockpit.token(";", 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::String id = node->Data()->sCockpit.token(";", 19);
		if ( id.Compare(cid) )
		{
			node->Data()->sCockpit = cockpit;
			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::String id = node->Data()->sCockpit.token(";", 19);
		if ( id.Compare(cid) )
		{
			Utils::String cockpit = node->Data()->sCockpit;
			cockpit = cockpit.replaceToken(";", 8, scene);
			cockpit = cockpit.replaceToken(";", 9, (long)mask);
			node->Data()->sCockpit = cockpit;
			break;
		}
	}
}
void CXspFile::NewCockpit(const Utils::String &id, const Utils::String &scene, int mask)
{
	Utils::String cockpit = "0;0;0;0;0;0;0;";
	cockpit += scene + ";";
	cockpit += (long)mask;
	cockpit += ";0;0;0;0;0;0;-100000;0;0;";
	cockpit += id + ";";
	this->AddCockpit(cockpit, -1);
}
 
bool CXspFile::RemoveCutData(const Utils::String &cut)
{
	bool ret = false;
	for ( SStringList *str = m_lCutData.Head(); str; str = str->next )
	{
		if ( str->str.GetToken(";", 1, 1).Compare(CyString(cut.token(";", 1))) )
		{
			ret = true;
			str->remove = true;
			break;
		}

	m_lCutData.RemoveMarked();
 
	return ret;
}
 
bool CXspFile::RemoveBodies(const Utils::String &cut)
{
	bool ret = false;
	for ( SStringList *str = m_lBodies.Head(); str; str = str->next )
	{
		if ( str->str.Remove(' ').Compare(CyString(cut.remove(' '))) )
		{
			ret = true;
			str->remove = true;
			break;
		}
	}
 
	m_lBodies.RemoveMarked();
 
	return ret;
}
 
bool CXspFile::RemoveAnimation(const Utils::String &cut)
{
	bool ret = false;
	for ( SStringList *str = m_lAnimations.Head(); str; str = str->next )
	{
		if ( str->str.Remove(' ').Remove('\n').Compare(CyString(cut.remove(' ').remove(&apos;\n'))) )
		{
			ret = true;
			str->remove = true;
			break;
		}

	m_lAnimations.RemoveMarked();
 
	return ret;
}
 
void CXspFile::AddCockpit(const Utils::String &cockpit, int game, int mask, int index)
{
	SCockpit *pCockpit = NULL;
 
	// first search for the cockpit entry
	Utils::String cid = cockpit.token(";", 19);
	for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )
	{
		Utils::String id = node->Data()->sCockpit.token(";", 19);
		if ( id.Compare(cid) )
		{
			pCockpit = node->Data();
			break;
		}

				break;
			}
		}
 
		if ( !wm )
		{
			wm = new SWeaponMask;
			pCockpit->lWeaponMask.push_back(wm);
		}
 
		wm->iGame = game;
		if ( mask == -1 )
			wm->iMask = cockpit.token(";", 9);
		else
			wm->iMask = mask;
	}
	m_bChanged = true; 
}
 
void CXspFile::AddBody(const Utils::String &section, const Utils::String &data)
{
	this->AddBodies(section + ";" + data);
	m_bChanged = true; 
}
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 += ";";
	}
	m_lBodies.PushBack(CyString(data), true);
	m_bChanged = true; 
}
 
int CXspFile::GetAnimationType(const Utils::String &type)
{
	if ( type.Compare("TAT_TAGSINGLESTEP") )
		return TAT_SINGLE;
	else if ( type.Compare("TAT_TAGONESHOT") 
				|| type.Compare("TAT_TAGONESHOT_REINIT") 

	return TAT_NONE;
}
 
bool CXspFile::ReadAnimations(CyStringList *lIn, CyStringList *lOut, int startRecord)
{
	Utils::String lastComment;
	Utils::String addEntry;
	int remaining = 0;
	Utils::String lastType;
	int newEntries = 0;
	int entries = -1;
	for ( SStringList *strNode = lIn->Head(); strNode; strNode = strNode->next )
	{
		Utils::String line = strNode->str.ToString();
		line.removeChar('\r');
		line.removeChar(9);
		if ( line.empty() || line[0] == '/' )
			continue;
		if ( entries == -1)
		{
			entries	= line.token(";", 1);
			newEntries = entries - startRecord;
		}
		else
		{
			// remove comments, endspaces and last ;
			Utils::String sStriped = line;
			if ( sStriped.isin("//") )
			{
				if ( entries <= newEntries )
					lastComment = "//" + sStriped.tokens("//", 2);
				sStriped = sStriped.token("//", 1);
			}
			sStriped.removeEndSpace();
			if ( sStriped.right(1) == ";" )
				sStriped.truncate(-1);
 
			Utils::String sRemainingLeft;
			if ( remaining > 0 )
				sRemainingLeft = sStriped;
			else
			{
				// each line should be a new entry, with some exceptions
				// potection for new lines
				lastType = sStriped.token(";", 1);
 
				switch (CXspFile::GetAnimationType(lastType))
				{
					case TAT_SINGLE:
						remaining = (long)sStriped.token(";", 5) + 1;
						sRemainingLeft = sStriped.tokens(";", 6);
						if ( entries <= newEntries )
							addEntry = sStriped.tokens(";", 1, 5) + ";";
						break;
					case TAT_3:
						remaining = (long)sStriped.token(";", 5) + 1;
						sRemainingLeft = sStriped.tokens(";", 6);
						if ( entries <= newEntries )
							addEntry = sStriped.tokens(";", 1, 5) + ";";
						break;
 
					default:
						remaining = 0;
						if ( entries <= newEntries )
							addEntry = sStriped;
 
				}
			}
 
			if ( !sRemainingLeft.empty() )
			{
				int tatType = CXspFile::GetAnimationType(lastType);
				if ( tatType == TAT_SINGLE )
				{
					if ( sRemainingLeft.isin(";") )
						remaining -= sRemainingLeft.countToken(";");
					else if ( !sRemainingLeft.empty() )
						--remaining;
 
					if ( entries <= newEntries )
						addEntry += sRemainingLeft + ";";
				}
				else if ( tatType == TAT_3 )
				{
					// last entry
					if ( remaining == 1 )
						--remaining;
					else if ( sRemainingLeft.isin(";") )
					{
						if ( !sRemainingLeft.isin("TATF_COORDS") )
						{
							int amt = sRemainingLeft.countToken(";") / 3;
							remaining -= amt;
							if ( remaining == 1 && (sRemainingLeft.countToken(";") - (amt * 3)) == 1 )
								--remaining;
						}
						else
						{
							int iRem = sRemainingLeft.countToken(";");
							int iPos = 1;
							while ( iPos < iRem )
							{
								Utils::String first = sRemainingLeft.token(";", iPos);
								if ( first.isin("TATF_COORDS") )
									iPos += 5;
								else
									iPos += 3;
								--remaining;
							}

				}
			}
 
			if ( remaining <= 0 )
			{
				if ( entries <= newEntries && !addEntry.empty())
				{
					if ( addEntry[(int)addEntry.length() - 1] != ';' )
						addEntry += ";";
					lOut->PushBack(CyString(addEntry + lastComment));
				}
				--entries;
			}
		}
	}

}
 
void CXspFile::AddAnimation(CyStringList *list)
{
	for ( SStringList *strNode = list->Head(); strNode; strNode = strNode->next )
		this->AddAnimation(strNode->str.ToString());
	m_bChanged = true; 
}
 
SText *CXspFile::FindShipText(int lang)
{

		return german;
	// otherwise use any we've found (usually first one)
	return found;
}
 
Utils::String CXspFile::GetTextName(int lang)
{
	SText *t = FindShipText(lang);
	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() )
				return t->sName;
		}
	}
 
	// still not found one, return the ships name
	return this->GetShipName(lang);
}
 
Utils::String CXspFile::GetTextDescription(int lang)
{
	SText *t = FindShipText(lang);
	if ( t )
	{
		// return the correct language text
		if ( !t->sDesc.empty() )
			return t->sDesc;
		// 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->sDesc.empty() )
				return t->sDesc;
		}
	}
 
	// still not found one, return the ships name
	if ( !m_sDescription.Empty() )
		return m_sDescription.ToString();
	return this->GetShipName(lang);
}
 
bool CXspFile::startExtractShip(CVirtualFileSystem *pVfs, const Utils::String &sId, CProgressInfo *pProgress)
{
	m_sID = sId.remove('\r');
	while ( m_sID.right(1) == ";" )
		m_sID.truncate(-1);
 
	m_sData = pVfs->getTShipsEntry(m_sID);
 

	bool extracted = false;
	if ( pVfs->ExtractGameFile("types/dummies.pck", "tmp") ) {
		CFileIO File("tmp");
		if ( File.Exists() )
		{
			Utils::String section;
			int secCount = 0;
			CyStringList *lines = File.ReadLinesStr();
			for ( SStringList *node = lines->Head(); node; node = node->next )
			{
				node->str.RemoveFirstSpace();

					continue;
 
				// not in a section yet
				if ( secCount <= 0 )
				{
					section = node->str.GetToken(";", 1, 1).ToString();
					secCount = node->str.GetToken(";", 2, 2).ToInt();
				}
				else
				{
					Utils::String first = node->str.GetToken(";", 1, 1).ToString();
					if ( sceneModels->FindString(first) )
					{
						this->AddDummy(section, node->str.ToString());
 
						if ( add )
						{
							int pos = 4;
							int scene = node->str.GetToken(";", 3, 3).ToInt();

							}
 
							int model = node->str.GetToken(";", pos, pos).ToInt();
							for ( int i = 0; i < model; i++ )
								sceneModels->PushBack(node->str.GetToken(";", pos + (i * 2) + 1, pos + (i * 2) + 1));
						}
					}
					--secCount;
 
				}
			}
 
			delete lines;
			File.Remove();
		}
	}
}
 
void CXspFile::extractComponants(CVirtualFileSystem *pVfs, CyStringList *sceneModels)
{
	if ( !sceneModels ) return;
	if ( pVfs->ExtractGameFile("types/components.pck", "tmp") )
	{
		CFileIO File("tmp");
		if ( File.Exists() )
		{
			Utils::String file;
			Utils::String section;
			int secCount = 0;
			int secCount2 = 0;
			CyStringList *lines = File.ReadLinesStr();
			for ( SStringList *node = lines->Head(); node; node = node->next )
			{
				node->str.RemoveFirstSpace();
				node->str.RemoveChar(9);
				node->str.RemoveChar('\r');
				if ( node->str.Empty() )
					continue;
				if ( node->str[0] == '/' )
					continue;
 
				// not in a section yet
				if ( secCount2 )
				{
					if ( sceneModels->FindString(file) )
						this->AddComponent(section, file, node->str.ToString());
					--secCount2;
				}
				else if ( secCount <= 0 )
				{
					section = node->str.GetToken(";", 1, 1).ToString();
					secCount = node->str.GetToken(";", 2, 2).ToInt();
				}
				else
				{
					file = node->str.GetToken(";", 1, 1).ToString();
					secCount2 = node->str.GetToken(";", 2, 2).ToInt();
					--secCount;
				}
			}
 
			delete lines;
			File.Remove();
		}

					CLEANSPLIT(strs, max)
				}
			}
 
			startLine = pos + 1;
		}
	}
	
	delete [] data;
 
	return true;

		else 
			pVfs->extractGameFileToPackage(this, "textures\\" + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER);
	}
}
 
bool CXspFile::AddTextFromFile(const Utils::String &sFile, int textId)
{
	Utils::String file = sFile;
 
	bool remove = false;
	if ( CFileIO(file).CheckFileExtension("pck") )
	{
		C_File F;
		F.SetFilename(CyString(file));
		F.UnPCKFile();
		if ( F.WriteToFile("tmp") )
		{
			remove = true;
			file = "tmp";

	}
 
	return false;
}
 
bool CXspFile::ImportBodies(CyStringList *sceneModels, const Utils::String &filename)
{
	CFileIO File(filename);
	if ( File.Exists() )
	{
		Utils::String sSection;
		int section = 0;
		CyStringList *lines = File.ReadLinesStr();
		for ( SStringList *node = lines->Head(); node; node = node->next )
		{
			node->str.RemoveChar(9);

				continue;
			
			// are we looking for a section
			if ( section <= 0 )
			{
				sSection = node->str.GetToken(";", 1, 1).ToString();
				section = node->str.GetToken(";", 2, 2).ToInt();
			}
			else
			{
				int max;

					{
						strs[i].RemoveSpaces();
						if (strs[i].Empty() )
							continue;
						if ( sceneModels->FindString(strs[i]) )
							this->AddBody(sSection, strs[i].ToString());
						--section;
					}
				}
				CLEANSPLIT(strs, max)
			}

	}
 
	return false;
}
 
bool CXspFile::ImportCockpits(const Utils::String &filename)
{
	CFileIO File(filename);
	if ( File.Exists() )
	{
		CyStringList *lines = File.ReadLinesStr();

		for ( int i = 0; i < 6; i++ )
		{
			int idx = m_sData.token(";", 32 + (i * 2));
			if ( idx < lines->Count() && idx )
			{
				Utils::String turret = lines->GetAt(idx)->str.ToString();
				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);
			}
		}

		textId = m_sData.token(";", 7);
 
	if ( textId <= 0 )
		return false;
 
	Utils::String line;
	if ( !id )
		return false;
 
	bool added = false;
 
	Utils::String shipName;
	Utils::String shipDesc;
 
	int lang = 0;
	bool inpage = false;
	while ( !feof(id) )
	{
		if ( !shipName.empty() && !shipDesc.empty() )
		{
			added = true;
			break;
		}
 
		line.readToEndOfLine(id, 0, false);
		line.removeChar(9);
		line.removeChar('\r');
		line.removeFirstSpace();
 
		if ( inpage )
		{
			if ( line.left(6).Compare("</page") )
				break;
 
			// find matching id
			if ( line.left(6).Compare("<t id=") )
			{
				int pos = line.findPos("id=\"", 0);
				if ( pos != -1 )
				{
					int endpos = line.findPos("\"", pos + 5);
					if ( endpos != -1 )
					{
						int id = line.mid(pos + 5, endpos);
						if ( id == textId || id == (textId + 1) )
						{
							pos = line.findPos(">", endpos);
							if ( pos != -1 )
							{
								endpos = line.findPos("</t>", pos);
								if ( endpos != -1 )
								{
									if ( id == textId )
										shipName = line.mid(pos + 2, endpos - (pos + 1));
									else
										shipDesc = line.mid(pos + 2, endpos - (pos + 1));
								}
							}
						}
					}
				}
			}
		}
		else if ( lang ) // search for page 17
		{
			if ( line.left(8).Compare("<page id") )
			{
				int pos = line.findPos("id=\"");
				if ( pos != -1 )
				{
					int endpos = line.findPos("\"", pos + 5);
					if ( endpos != -1 )
					{
						Utils::String sId = line.mid(pos + 5, endpos - (pos + 4));
						int id = sId;
						if ( id == 17 || ((int)sId.right(4)) == 17 )
							inpage = true;
					}
				}
			}
		}
		else if ( line.left(12).Compare("<language id") )
		{
			int pos = line.findPos("id=\"");
			if ( pos != -1 )
			{
				int endpos = line.findPos("\"", pos + 5);
				if ( endpos != -1 )
					lang = line.mid(pos + 5, endpos - (pos + 4));
			}
		}
	}
 
	// incase we only found the shipname
	if ( !shipName.empty() )
		added = true;
 
	if ( added )
	{
		if ( lang == 44 || m_sName.Empty())

	{
		SCockpit *c = node->Data();
		if ( c->iIndex < 0 )
			continue;
 
		Utils::String id = c->sCockpit.token(";", 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 + "(" + Utils::String::number(c->iIndex) + ")").c_str());
		}
	}
}
 
Utils::String CXspFile::FormatShipData(CyStringList *cockpits, int *text, int game)
{
	Utils::String data = (game == GAME_X3) ? this->GetX3ShipData() : this->GetTCShipData();
	// do turrets
	for ( int t = 0; t < 6; t++ )
	{
		int oldPos = 0;
		Utils::String turret = data.token(";", 32 + (t * 2));
		if ( !turret.isNumber() )
		{
			if ( turret.isin("(") )
			{
				oldPos = turret.tokens("(", 2).token(")", 1);
				turret = turret.token("(", 1);
			}
			int pos = cockpits->FindStringPos(turret);
			if ( pos < 0 )	pos = oldPos;
			if ( pos >= cockpits->Count() ) pos = 0;
			data = data.replaceToken(";", 32 + (t * 2), (long)pos);
		}
	}
	// adjust the weapons
	int mask = this->GetLaserMask(game - 1);
	if ( mask != -1 )
		data = data.replaceToken(";", 19, (long)mask);
	mask = this->GetMissileMask(game - 1);
	if ( mask != -1 )
		data = data.replaceToken(";", 25, (long)mask);
 
	// fix the ship text
	if ( m_iOrgDesc > 0 )
		(*text) = m_iOrgDesc;
	data = data.replaceToken(";", 7, (long)*text);
 
	// add the ware id
	data.removeChar(9);
	data.removeEndSpace();
	// remove the end ;
	while ( data.right(1) == ";" ) data.truncate(-1);
	data = data.replaceToken(";", data.countToken(";"), this->GetShipID());
	if ( data.right(1) != ";" )
		data += ";";
 
	return data;
}
 

Rev 35	Rev 39
Line 39...	Line 39...
39	`m_iOrgDesc = 0;`	39	`m_iOrgDesc = 0;`
40		40
41	`m_iShipyard = SHIPYARD_NONE;`	41	`m_iShipyard = SHIPYARD_NONE;`
42	`}`	42	`}`
43		43
44	`void CXspFile::AddText ( int id, CyString name, CyString desc )`	44	`void CXspFile::AddText ( int id, const Utils::String &name, const Utils::String &desc )`
45	`{`	45	`{`
46	`// first check if theres an existing id`	46	`// first check if theres an existing id`
47	`SText *newtext = NULL;`	47	`SText *newtext = NULL;`
48	`for ( SText *t = m_lText.First(); t; t = m_lText.Next() )`	48	`for ( SText *t = m_lText.First(); t; t = m_lText.Next() )`
49	`{`	49	`{`
Line 78...	Line 78...
78	`return;`	78	`return;`
79	`}`	79	`}`
80	`}`	80	`}`
81	`}`	81	`}`
82		82
83	`void CXspFile::AddDummy ( CyString section, CyString data )`	83	`void CXspFile::AddDummy ( const Utils::String &section, const Utils::String &data )`
84	`{`	84	`{`
85	`SDummy *d = new SDummy;`	85	`SDummy *d = new SDummy;`
86	`d->sData = data;`	86	`d->sData = data;`
87	`d->sSection = section;`	87	`d->sSection = section;`
88		88
89	`if ( d->sData.Right (1) != ";" )`	89	`if ( d->sData.right(1) != ";" )`
90	`d->sData += ";";`	90	`d->sData += ";";`
91		91
92	`m_lDummy.push_back ( d );`	92	`m_lDummy.push_back ( d );`
93		93
94	`m_bChanged = true;`	94	`m_bChanged = true;`
95	`}`	95	`}`
96		96
97	`void CXspFile::AddComponent ( CyString section, CyString section2, CyString data )`	97	`void CXspFile::AddComponent ( const Utils::String &section, const Utils::String &section2, const Utils::String &data )`
98	`{`	98	`{`
99	`SComponent *c = new SComponent;`	99	`SComponent *c = new SComponent;`
100	`c->sData = data;`	100	`c->sData = data;`
101	`c->sSection = section;`	101	`c->sSection = section;`
102	`c->sSection2 = section2;`	102	`c->sSection2 = section2;`
103		103
104	`if ( c->sData.Right (1) != ";" )`	104	`if ( c->sData.right(1) != ";" )`
105	`c->sData += ";";`	105	`c->sData += ";";`
106		106
107	`m_lComponent.push_back ( c );`	107	`m_lComponent.push_back ( c );`
108		108
109	`m_bChanged = true;`	109	`m_bChanged = true;`
Line 190...	Line 190...
190	`values += (long)wNode->Data()->iGame;`	190	`values += (long)wNode->Data()->iGame;`
191	`values += ":";`	191	`values += ":";`
192	`values += (long)wNode->Data()->iMask;`	192	`values += (long)wNode->Data()->iMask;`
193	`}`	193	`}`
194	`values += " ";`	194	`values += " ";`
195	`values += cockpit->sCockpit.ToString() + "\n";`	195	`values += cockpit->sCockpit + "\n";`
196	`}`	196	`}`
197		197
198	`for ( CListNode<SText> *tNode = m_lText.Front(); tNode; tNode = tNode->next() )`	198	`for ( CListNode<SText> *tNode = m_lText.Front(); tNode; tNode = tNode->next() )`
199	`values += Utils::String("Text: ") + (long)tNode->Data()->iId + "\|" + tNode->Data()->sName.FindReplace("\|", "<::PiPe::>").ToString() + "\|" + tNode->;Data()->sDesc.ToString() + "\n";`	199	`values += Utils::String("Text: ") + (long)tNode->Data()->iId + "\|" + tNode->Data()->sName.findReplace("\|", "<::PiPe::>") + "\|" + tNode->;Data()->sDesc + "\n";`
200		200
201	`for ( CListNode<SComponent> *cNode = m_lComponent.Front(); cNode; cNode = cNode->next() )`	201	`for ( CListNode<SComponent> *cNode = m_lComponent.Front(); cNode; cNode = cNode->next() )`
202	`values += Utils::String("Component: ") + cNode->Data()->sData.FindReplace("\|", "<::PiPe::>").ToString() + "\|" + cNode->;Data()->sSection.FindReplace("\|", "<::PiPe::>").ToString() + "\|"; + cNode->Data()->sSection2.ToString() + "\n";`	202	`values += "Component: " + cNode->Data()->sData.findReplace("\|", "<::PiPe::>") + "\|" + cNode->;Data()->sSection.findReplace("\|", "<::PiPe::>") + "\|"; + cNode->Data()->sSection2 + "\n";`
203		203
204	`for ( CListNode<SDummy> *dNode = m_lDummy.Front(); dNode; dNode = dNode->next() )`	204	`for ( CListNode<SDummy> *dNode = m_lDummy.Front(); dNode; dNode = dNode->next() )`
205	`values += Utils::String("Dummy: ") + dNode->Data()->sData.FindReplace("\|", "<::PiPe::>").ToString() + "\|" + dNode->Data()->sSection.ToString() + "\n";`	205	`values += "Dummy: " + dNode->Data()->sData.findReplace("\|", "<::PiPe::>") + "\|" + dNode->Data()->sSection + "\n";`
206		206
207	`for ( CListNode<SWeaponMask> *wNode = m_lWeaponMasks.Front(); wNode; wNode = wNode->next() )`	207	`for ( CListNode<SWeaponMask> *wNode = m_lWeaponMasks.Front(); wNode; wNode = wNode->next() )`
208	`values += Utils::String("WeaponMask: ") + (long)wNode->Data()->iGame + " " + (long)wNode->Data()->iMask + "\n";`	208	`values += Utils::String("WeaponMask: ") + (long)wNode->Data()->iGame + " " + (long)wNode->Data()->iMask + "\n";`
209	`for ( CListNode<SWeaponMask> *mNode = m_lMissileMasks.Front(); mNode; mNode = mNode->next() )`	209	`for ( CListNode<SWeaponMask> *mNode = m_lMissileMasks.Front(); mNode; mNode = mNode->next() )`
210	`values += Utils::String("MissileMask: ") + (long)mNode->Data()->iGame + " " + (long)mNode->Data()->iMask + "\n";`	210	`values += Utils::String("MissileMask: ") + (long)mNode->Data()->iGame + " " + (long)mNode->Data()->iMask + "\n";`
Line 265...	Line 265...
265	`else if ( first == "Text" )`	265	`else if ( first == "Text" )`
266	`{`	266	`{`
267	`SText *text = new SText;`	267	`SText *text = new SText;`
268	`text->iId = rest.token("\|", 1);`	268	`text->iId = rest.token("\|", 1);`
269	`text->sName = rest.token("\|", 2);`	269	`text->sName = rest.token("\|", 2);`
270	`text->sName = text->sName.FindReplace("<::PiPe::>", "\|");`	270	`text->sName = text->sName.findReplace("<::PiPe::>", "\|");`
271	`text->sDesc = rest.tokens( "\|", 3);`	271	`text->sDesc = rest.tokens( "\|", 3);`
272	`m_lText.push_back ( text );`	272	`m_lText.push_back ( text );`
273	`}`	273	`}`
274	`else if ( first == "Component" )`	274	`else if ( first == "Component" )`
275	`{`	275	`{`
276	`SComponent *c = new SComponent;`	276	`SComponent *c = new SComponent;`
277	`c->sData = rest.token("\|", 1);`	277	`c->sData = rest.token("\|", 1);`
278	`c->sData = c->sData.FindReplace ("<::PiPe::>", "\|");`	278	`c->sData = c->sData.findReplace ("<::PiPe::>", "\|");`
279	`c->sSection = rest.token("\|", 2);`	279	`c->sSection = rest.token("\|", 2);`
280	`c->sSection = c->sSection.FindReplace ("<::PiPe::>", "\|");`	280	`c->sSection = c->sSection.findReplace ("<::PiPe::>", "\|");`
281	`c->sSection2 = rest.tokens("\|", 3);`	281	`c->sSection2 = rest.tokens("\|", 3);`
282	`m_lComponent.push_back ( c );`	282	`m_lComponent.push_back ( c );`
283	`}`	283	`}`
284	`else if ( first == "Dummy" )`	284	`else if ( first == "Dummy" )`
285	`{`	285	`{`
286	`SDummy *d = new SDummy;`	286	`SDummy *d = new SDummy;`
287	`d->sData = rest.token("\|", 1);`	287	`d->sData = rest.token("\|", 1);`
288	`d->sData = d->sData.FindReplace ("<::PiPe::>", "\|");`	288	`d->sData = d->sData.findReplace ("<::PiPe::>", "\|");`
289	`d->sSection = rest.tokens( "\|", 2);`	289	`d->sSection = rest.tokens( "\|", 2);`
290	`m_lDummy.push_back ( d );`	290	`m_lDummy.push_back ( d );`
291	`}`	291	`}`
292	`else if ( first == "Comment" )`	292	`else if ( first == "Comment" )`
293	`m_sDescription = rest.findReplace("<newline>", "<br>");`	293	`m_sDescription = rest.findReplace("<newline>", "<br>");`
Line 295...	Line 295...
295	`return CBaseFile::ParseValueLine(sLine);`	295	`return CBaseFile::ParseValueLine(sLine);`
296		296
297	`return true;`	297	`return true;`
298	`}`	298	`}`
299		299
300	`CyString CXspFile::GetShipName(int lang)`	300	`Utils::String CXspFile::GetShipName(int lang)`
301	`{`	301	`{`
302	`CyString name;`	302	`Utils::String name;`
303	`if ( (m_bLanguageText) && (lang) )`	303	`if ( (m_bLanguageText) && (lang) )`
304	`{`	304	`{`
305	`for ( SText *text = m_lText.First(); text; text = m_lText.Next() )`	305	`for ( SText *text = m_lText.First(); text; text = m_lText.Next() )`
306	`{`	306	`{`
307	`if ( text->iId == lang )`	307	`if ( text->iId == lang )`
Line 310...	Line 310...
310	`break;`	310	`break;`
311	`}`	311	`}`
312	`}`	312	`}`
313	`}`	313	`}`
314		314
315	`if ( name.Empty() )`	315	`if ( name.empty() )`
316	`name = GetLanguageName(lang);`	316	`name = GetLanguageName(lang).ToString();`
317		317
318	`return name;`	318	`return name;`
319	`}`	319	`}`
320		320
-		321	`//TODO: split this up`
321	`bool CXspFile::ConvertOld(CyString file)`	322	`bool CXspFile::ConvertOld(const Utils::String &file)`
322	`{`	323	`{`
323	`// open the file`	324	`// open the file`
324	`FILE *id = fopen(file.c_str(), "rb");`	325	`FILE *id = fopen(file.c_str(), "rb");`
325	`if ( !id )`	326	`if ( !id )`
326	`return false;`	327	`return false;`
Line 353...	Line 354...
353	`while ( pos < len )`	354	`while ( pos < len )`
354	`{`	355	`{`
355	`while ( compr[pos++] != '\n' && pos < len );`	356	`while ( compr[pos++] != '\n' && pos < len );`
356		357
357	`compr[pos - 1] = '\0';`	358	`compr[pos - 1] = '\0';`
358	`CyString line = (char *)(compr + start);`	359	`Utils::String line = (char *)(compr + start);`
359	`start = pos;`	360	`start = pos;`
360	`if ( line.Empty() )`	361	`if ( line.empty() )`
361	`continue;`	362	`continue;`
362	`CyString first = line.GetToken(":", 1, 1);`	363	`Utils::String first = line.token(":", 1);`
363	`CyString rest = line.GetToken(":", 2);`	364	`Utils::String rest = line.tokens(":", 2);`
364	`rest = rest.RemoveFirstSpace();`	365	`rest = rest.removeFirstSpace();`
365		366
366	`// now check each line`	367	`// now check each line`
367	`if ( first.Compare("Packager") )`	368	`if ( first.Compare("Packager") )`
368	`packageVersion = rest.ToInt();`	369	`packageVersion = rest;`
369	`else if ( first.Compare("Shipyard") )`	370	`else if ( first.Compare("Shipyard") )`
370	`{`	371	`{`
371	`int max;`	372	`int max;`
372	`CyString *strs = rest.SplitToken(";", &max);`	373	`Utils::String *strs = rest.tokenise(";", &max);`
373	`if ( strs && max )`	374	`if ( strs && max )`
374	`{`	375	`{`
375	`int cur = 1;`	376	`int cur = 1;`
376	`for ( int i = 0; i < max; i++, cur *= 2 )`	377	`for ( int i = 0; i < max; i++, cur *= 2 )`
377	`{`	378	`{`
Line 381...	Line 382...
381	`}`	382	`}`
382	`CLEANSPLIT(strs, max)`	383	`CLEANSPLIT(strs, max)`
383	`}`	384	`}`
384	`else if ( first.Compare("ScreenShot") )`	385	`else if ( first.Compare("ScreenShot") )`
385	`{`	386	`{`
386	`int size = rest.GetToken(" ", 1, 1).ToInt();`	387	`int size = rest.token(" ", 1);`
387	`CyString ext = rest.GetToken(" ", 2, 2);`	388	`Utils::String ext = rest.token(" ", 2);`
388		389
389	`C_File *newFile = this->AddFile(CyString(m_sID) + ";_" + CyString::Number(this->CountFiles(FILETYPE_SCREEN) + 1) + "." + ext, "", FILETYPE_SCREEN);`	390	`C_File *newFile = this->AddFile(m_sID + ";_" + (long)(this->CountFiles(FILETYPE_SCREEN) + 1) + "." + ext, "", FILETYPE_SCREEN);`
390	`newFile->ReadFromData((char *)(compr + pos), size);`	391	`newFile->ReadFromData((char *)(compr + pos), size);`
391		392
392	`start += (size + 1);`	393	`start += (size + 1);`
393	`}`	394	`}`
394	`else if ( first.Compare("SceneFile") )`	395	`else if ( first.Compare("SceneFile") )`
395	`{`	396	`{`
396	`CyString file = rest.GetToken(" ", 3);`	397	`Utils::String file = rest.tokens(" ", 3);`
397	`m_pSceneFile = this->AddFile(CFileIO(file).GetFilename(), CFileIO(file).GetDir(), FILETYPE_SHIPSCENE);`	398	`m_pSceneFile = this->AddFile(CFileIO(file).GetFilename(), CFileIO(file).GetDir(), FILETYPE_SHIPSCENE);`
398	`m_pSceneFile->SetCreationTime(rest.GetToken(" ", 1, 1).ToLong());`	399	`m_pSceneFile->SetCreationTime((long)rest.token(" ", 1));`
399	`m_pSceneFile->ReadFromData((char *)(compr + pos), rest.GetToken(" ", 2, 2).ToInt());`	400	`m_pSceneFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`
400		401
401	`start += m_pSceneFile->GetDataSize();`	402	`start += m_pSceneFile->GetDataSize();`
402	`}`	403	`}`
403	`else if ( first.Compare("CockpitFile") )`	404	`else if ( first.Compare("CockpitFile") )`
404	`{`	405	`{`
405	`CyString file = rest.GetToken(" ", 3);`	406	`Utils::String file = rest.tokens(" ", 3);`
406	`m_pCockpitFile = this->AddFile(CFileIO(file).GetFilename(), CFileIO(file).GetDir(), FILETYPE_COCKPITSCENE);`	407	`m_pCockpitFile = this->AddFile(CFileIO(file).GetFilename(), CFileIO(file).GetDir(), FILETYPE_COCKPITSCENE);`
407	`m_pCockpitFile->SetCreationTime(rest.GetToken(" ", 1, 1).ToLong());`	408	`m_pCockpitFile->SetCreationTime((long)rest.token(" ", 1));`
408	`m_pCockpitFile->ReadFromData((char *)(compr + pos), rest.GetToken(" ", 2, 2).ToInt());`	409	`m_pCockpitFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`
409		410
410	`start += m_pCockpitFile->GetDataSize();`	411	`start += m_pCockpitFile->GetDataSize();`
411	`}`	412	`}`
412	`else if ( first.Compare("Model") )`	413	`else if ( first.Compare("Model") )`
413	`{`	414	`{`
414	`CyString file = rest.GetToken(" ", 3);`	415	`Utils::String file = rest.tokens(" ", 3);`
415	`C_File *newFile= this->AddFile(CFileIO(file).GetFilename(), CFileIO(file).GetDir(), FILETYPE_SHIPMODEL);`	416	`C_File *newFile= this->AddFile(CFileIO(file).GetFilename(), CFileIO(file).GetDir(), FILETYPE_SHIPMODEL);`
416	`newFile->SetCreationTime(rest.GetToken(" ", 1, 1).ToLong());`	417	`newFile->SetCreationTime((long)rest.token(" ", 1));`
417	`newFile->ReadFromData((char *)(compr + pos), rest.GetToken(" ", 2, 2).ToInt());`	418	`newFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`
418		419
419	`start += (newFile->GetDataSize() + 1);`	420	`start += (newFile->GetDataSize() + 1);`
420	`}`	421	`}`
421	`else if ( first.Compare("Files") )`	422	`else if ( first.Compare("Files") )`
422	`{`	423	`{`
423	`CyString file = rest.GetToken(" ", 3);`	424	`Utils::String file = rest.tokens(" ", 3);`
424		425
425	`C_File *newFile = NULL;`	426	`C_File *newFile = NULL;`
426	`int special = 0;`	427	`int special = 0;`
427	`if ( file.Compare("types/CutData.txt") \|\| file.Compare("types/CutData.pck") )`	428	`if ( file.Compare("types/CutData.txt") \|\| file.Compare("types/CutData.pck") )`
428	`{`	429	`{`
429	`newFile = new C_File(file);`	430	`newFile = new C_File(CyString(file));`
430	`special = 1;`	431	`special = 1;`
431	`}`	432	`}`
432	`else if ( file.Compare("types/Bodies.txt") \|\| file.Compare("types/Bodies.pck") )`	433	`else if ( file.Compare("types/Bodies.txt") \|\| file.Compare("types/Bodies.pck") )`
433	`{`	434	`{`
434	`newFile = new C_File(file);`	435	`newFile = new C_File(CyString(file));`
435	`special = 2;`	436	`special = 2;`
436	`}`	437	`}`
437	`else if ( file.Compare("types/Animations.txt") \|\| file.Compare("types/Animations.pck") )`	438	`else if ( file.Compare("types/Animations.txt") \|\| file.Compare("types/Animations.pck") )`
438	`{`	439	`{`
439	`newFile = new C_File(file);`	440	`newFile = new C_File(CyString(file));`
440	`special = 3;`	441	`special = 3;`
441	`}`	442	`}`
442	`else`	443	`else`
443	`{`	444	`{`
444	`newFile = this->AddFile(CFileIO(file).GetFilename(), CFileIO(file).GetDir(), FILETYPE_SHIPOTHER);`	445	`newFile = this->AddFile(CFileIO(file).GetFilename(), CFileIO(file).GetDir(), FILETYPE_SHIPOTHER);`
445	`newFile->SetCreationTime(rest.GetToken(" ", 1, 1).ToLong());`	446	`newFile->SetCreationTime((long)rest.token(" ", 1));`
446	`}`	447	`}`
447	`newFile->ReadFromData((char *)(compr + pos), rest.GetToken(" ", 2, 2).ToInt());`	448	`newFile->ReadFromData((char *)(compr + pos), rest.token(" ", 2));`
448	`start += (newFile->GetDataSize() + 1);`	449	`start += (newFile->GetDataSize() + 1);`
449		450
450	`if ( special )`	451	`if ( special )`
451	`{`	452	`{`
452	`if ( newFile->CheckFileExt("pck") )`	453	`if ( newFile->CheckFileExt("pck") )`
Line 513...	Line 514...
513	`break;`	514	`break;`
514	`}`	515	`}`
515	`}`	516	`}`
516		517
517	`for ( SStringList *strNode = newLines.Head(); strNode; strNode = strNode->next )`	518	`for ( SStringList *strNode = newLines.Head(); strNode; strNode = strNode->next )`
518	`this->AddCutData(strNode->str);`	519	`this->AddCutData(strNode->str.ToString());`
519	`}`	520	`}`
520	`// bodies`	521	`// bodies`
521	`else if ( special == 2 )`	522	`else if ( special == 2 )`
522	`{`	523	`{`
523	`entries = 0;`	524	`entries = 0;`
524	`CyString section;`	525	`Utils::String section;`
525	`for ( int i = 0; i < iLines; i++ )`	526	`for ( int i = 0; i < iLines; i++ )`
526	`{`	527	`{`
527	`CyString line = sLines[i];`	528	`Utils::String line = sLines[i].ToString();`
528	`line.RemoveChar(' ');`	529	`line.removeChar(' ');`
529	`line.RemoveChar(9);`	530	`line.removeChar(9);`
530	`if ( line.Empty() \|\| line[0] == '/' )`	531	`if ( line.empty() \|\| line[0] == '/' )`
531	`continue;`	532	`continue;`
532	`if ( entries <= 0)`	533	`if ( entries <= 0)`
533	`{`	534	`{`
534	`section = line.GetToken(";", 1, 1);`	535	`section = line.token(";", 1);`
535	`entries = line.GetToken(";", 2, 2).ToInt();`	536	`entries = line.token(";", 2);`
536	`}`	537	`}`
537	`else`	538	`else`
538	`{`	539	`{`
539	`if ( !line.IsIn(";") )`	540	`if ( !line.isin(";") )`
540	`continue;`	541	`continue;`
541	`if ( line.NumToken(";") <= 2 )`	542	`if ( line.countToken(";") <= 2 )`
542	`{`	543	`{`
543	`this->AddBodies(section + ";" + line.GetToken(";", 1, 1) + ";");`	544	`this->AddBodies(section + ";" + line.token(";", 1) + ";");`
544	`--entries;`	545	`--entries;`
545	`}`	546	`}`
546	`else`	547	`else`
547	`{`	548	`{`
548	`bool done = false;`	549	`bool done = false;`
549	`while (!done)`	550	`while (!done)`
550	`{`	551	`{`
551	`int num;`	552	`int num;`
552	`CyString *strs = line.SplitToken(";", &num);`	553	`Utils::String *strs = line.tokenise(";", &num);`
553	`done = true;`	554	`done = true;`
554	`for ( int j = 0; j < num; j++ )`	555	`for ( int j = 0; j < num; j++ )`
555	`{`	556	`{`
556	`if ( !entries )`	557	`if ( !entries )`
557	`{`	558	`{`
558	`line = line.GetToken(";", j + 1);`	559	`line = line.tokens(";", j + 1);`
559	`if ( !line.Empty() )`	560	`if ( !line.empty() )`
560	`done = false;`	561	`done = false;`
561	`break;`	562	`break;`
562	`}`	563	`}`
563		564
564	`if ( strs[j].Empty() )`	565	`if ( strs[j].empty() )`
565	`continue;`	566	`continue;`
566		567
567	`this->AddBodies(section + ";" + strs[j] + ";");`	568	`this->AddBodies(section + ";" + strs[j] + ";");`
568	`--entries;`	569	`--entries;`
569	`}`	570	`}`
570	`//we must be at another section`	571	`//we must be at another section`
571	`if ( !done )`	572	`if ( !done )`
572	`{`	573	`{`
573	`section = line.GetToken(";", 1, 1);`	574	`section = line.token(";", 1);`
574	`entries = line.GetToken(";", 2, 2).ToInt();`	575	`entries = line.token(";", 2);`
575	`line = line.RemToken(";", 1);`	576	`line = line.remToken(";", 1);`
576	`line = line.RemToken(";", 1);`	577	`line = line.remToken(";", 1);`
577		578
578	`if (line.Empty())`	579	`if (line.empty())`
579	`done = true;`	580	`done = true;`
580	`}`	581	`}`
581		582
582	`CLEANSPLIT(strs, num)`	583	`CLEANSPLIT(strs, num)`
583	`}`	584	`}`
Line 604...	Line 605...
604	`delete newFile;`	605	`delete newFile;`
605	`}`	606	`}`
606	`}`	607	`}`
607	`else if ( first.Compare("Script") )`	608	`else if ( first.Compare("Script") )`
608	`{`	609	`{`
609	`CyString file = rest.GetToken(" ", 3);`	610	`Utils::String file = rest.words(3);`
610	`C_File *newFile= this->AddFile(file, NullString, FILETYPE_SCRIPT);`	611	`C_File *newFile= this->AddFile(file, NullString, FILETYPE_SCRIPT);`
611	`newFile->SetCreationTime(rest.GetToken(" ", 1, 1).ToLong());`	612	`newFile->SetCreationTime((long)rest.word(1));`
612	`newFile->ReadFromData((char *)(compr + pos), rest.GetToken(" ", 2, 2).ToInt());`	613	`newFile->ReadFromData((char *)(compr + pos), rest.word(2));`
613		614
614	`start += (newFile->GetDataSize() + 1);`	615	`start += (newFile->GetDataSize() + 1);`
615	`}`	616	`}`
616	`else if ( first.Compare("Text") )`	617	`else if ( first.Compare("Text") )`
617	`this->AddText(rest.GetToken ( ":", 1, 1 ).ToInt(), rest.GetToken ( ":", 2, 2 ), rest.GetToken ( ":", 3 ));`	618	`this->AddText(rest.token(":", 1), rest.token(":", 2), rest.tokens(":", 3));`
618	`else if ( first.Compare("Component") )`	619	`else if ( first.Compare("Component") )`
619	`this->AddComponent(rest.GetToken ( ";", 1, 1 ), rest.GetToken ( ";", 2, 2 ), rest.GetToken ( ";", 3 ));`	620	`this->AddComponent(rest.token(";", 1), rest.token(";", 2), rest.tokens(";", 3));`
620	`else if ( first.Compare("Dummy") )`	621	`else if ( first.Compare("Dummy") )`
621	`{`	622	`{`
622	`SDummy *d = new SDummy;`	623	`SDummy *d = new SDummy;`
623	`d->sData = rest.GetToken ( ";;", 2 );`	624	`d->sData = rest.tokens(";;", 2);`
624	`d->sSection = rest.GetToken ( ";;", 1, 1 );`	625	`d->sSection = rest.token(";;", 1);`
625	`m_lDummy.push_back ( d );`	626	`m_lDummy.push_back ( d );`
626	`}`	627	`}`
627	`else if ( !this->ParseValueLine(line.ToString()) )`	628	`else if ( !this->ParseValueLine(line) )`
628	`{`	629	`{`
629	`// printf ( "Command: %s, Rest: %s\n", first.c_str(), rest.c_str());`	630	`// printf ( "Command: %s, Rest: %s\n", first.c_str(), rest.c_str());`
630	`}`	631	`}`
631		632
632	`pos = start;`	633	`pos = start;`
633	`}`	634	`}`
634		635
635	`// assume all old ones are for X3`	636	`// assume all old ones are for X3`
636	`if ( !m_sData.empty() )`	637	`if ( !m_sData.empty() )`
637	`{`	638	`{`
638	`this->AddWeaponMask(GAME_X3 - 1, m_sData.token(";", 19));`	639	`this->AddWeaponMask(GAME_X3 - 1, m_sData.token(";", 19));`
639	`this->AddMissileMask(GAME_X3 - 1, m_sData.token(";", 25));`	640	`this->AddMissileMask(GAME_X3 - 1, m_sData.token(";", 25));`
640	`}`	641	`}`
641		642
642	`return true;`	643	`return true;`
643	`}`	644	`}`
644		645
645		646
646	`int GetMaxShipyards() { return (int)SHIPYARD_MAX; }`	647	`int GetMaxShipyards() { return (int)SHIPYARD_MAX; }`
647		648
648	`CyString GetShipyardName (int s)`	649	`Utils::String GetShipyardName (int s)`
649	`{`	650	`{`
650	`switch (s)`	651	`switch (s)`
651	`{`	652	`{`
652	`case SHIPYARD_ARGON:`	653	`case SHIPYARD_ARGON:`
653	`return "Argon";`	654	`return "Argon";`
Line 668...	Line 669...
668	`case SHIPYARD_TERRAN:`	669	`case SHIPYARD_TERRAN:`
669	`return "Terran";`	670	`return "Terran";`
670	`}`	671	`}`
671		672
672	`return "Unknown";`	673	`return "Unknown";`
673	`}`	674	`}`
674		675
675	`bool CXspFile::WriteHeader(FILE *id, int valueheader, int valueComprLen)`	676	`bool CXspFile::WriteHeader(FILE *id, int valueheader, int valueComprLen)`
676	`{`	677	`{`
677	`fprintf ( id, "XSPCycrow;%.2f;%d;%d\n", FILEVERSION, valueheader, valueComprLen );`	678	`fprintf ( id, "XSPCycrow;%.2f;%d;%d\n", FILEVERSION, valueheader, valueComprLen );`
678	`if ( ferror(id) )`	679	`if ( ferror(id) )`
679	`return false;`	680	`return false;`
680	`return true;`	681	`return true;`
681	`}`	682	`}`
682		683
683	`bool CXspFile::CheckHeader(const Utils::String header) const`	684	`bool CXspFile::CheckHeader(const Utils::String header) const`
684	`{`	685	`{`
685	`if ( header.Compare("XSPCycrow") )`	686	`if ( header.Compare("XSPCycrow") )`
686	`return true;`	687	`return true;`
687	`return false;`	688	`return false;`
688	`}`	689	`}`
689		690
690	`void CXspFile::SetLaserMask(int game, int mask)`	691	`void CXspFile::SetLaserMask(int game, int mask)`
691	`{`	692	`{`
692	`for ( CListNode<SWeaponMask> *node = m_lWeaponMasks.Front(); node; node = node->next() )`	693	`for ( CListNode<SWeaponMask> *node = m_lWeaponMasks.Front(); node; node = node->next() )`
693	`{`	694	`{`
694	`SWeaponMask *m = node->Data();`	695	`SWeaponMask *m = node->Data();`
695	`if ( m->iGame == game )`	696	`if ( m->iGame == game )`
696	`{`	697	`{`
697	`m->iMask = mask;`	698	`m->iMask = mask;`
698	`return;`	699	`return;`
699	`}`	700	`}`
700	`}`	701	`}`
701		702
702	`// no found, need to add it`	703	`// no found, need to add it`
703	`this->AddWeaponMask(game, mask);`	704	`this->AddWeaponMask(game, mask);`
704	`}`	705	`}`
705		706
706	`void CXspFile::SetMissileMask(int game, int mask)`	707	`void CXspFile::SetMissileMask(int game, int mask)`
707	`{`	708	`{`
Line 748...	Line 749...
748	`}`	749	`}`
749		750
750	`return mask;`	751	`return mask;`
751	`}`	752	`}`
752		753
753	`CyString CXspFile::GetShipClass()`	754	`Utils::String CXspFile::GetShipClass()`
754	`{`	755	`{`
755	`if ( !m_sData.empty() )`	756	`if ( !m_sData.empty() )`
756	`return m_sData.token(";", TSHIPPOS_CLASS);`	757	`return m_sData.token(";", TSHIPPOS_CLASS);`
757	`return "OBJ_SHIP_M5";`	758	`return "OBJ_SHIP_M5";`
758	`}`	759	`}`
Line 813...	Line 814...
813	`{`	814	`{`
814	`if ( sFirst.Compare("Shipyard") )`	815	`if ( sFirst.Compare("Shipyard") )`
815	`{`	816	`{`
816	`for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )`	817	`for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )`
817	`{`	818	`{`
818	`if ( sRest.Compare(GetShipyardName(i).ToString()) )`	819	`if ( sRest.Compare(GetShipyardName(i)) )`
819	`{`	820	`{`
820	`this->AddShipyard(i);`	821	`this->AddShipyard(i);`
821	`break;`	822	`break;`
822	`}`	823	`}`
823	`}`	824	`}`
Line 842...	Line 843...
842		843
843	`return true;`	844	`return true;`
844	`}`	845	`}`
845		846
846		847
847	`CyString CXspFile::GetX3ShipData()`	848	`Utils::String CXspFile::GetX3ShipData()`
848	`{`	849	`{`
849	`CyString data = m_sData;`	850	`Utils::String data = m_sData;`
850		851
851	`// change the ship subtype, Reunion uses number, TC uses a define`	852	`// change the ship subtype, Reunion uses number, TC uses a define`
852	`CyString sSubType = data.GetToken(";", 6, 6);`	853	`Utils::String sSubType = data.token(";", 6);`
853	`if ( !sSubType.ToInt() && sSubType != "0" )`	854	`if ( !((long)sSubType) && sSubType != "0" )`
854	`data = data.RepToken(";", 6, CyString::Number(CShipData::ConvertShipSubType(sSubType)));`	855	`data = data.replaceToken(";", 6, (long)CShipData::ConvertShipSubType(CyString(sSubType)));`
855		856
856	`CyString sClass = data.GetToken(";", TSHIPPOS_CLASS, TSHIPPOS_CLASS);`	857	`Utils::String sClass = data.token(";", TSHIPPOS_CLASS);`
857	`if ( !sClass.ToInt() && sClass != "0" )`	858	`if ( !((long)sClass) && sClass != "0" )`
858	`{`	859	`{`
859	`int num = 0;`	860	`int num = 0;`
860	`for ( int i = 0; i < OBJ_SHIP_MAX; i++ )`	861	`for ( int i = 0; i < OBJ_SHIP_MAX; i++ )`
861	`{`	862	`{`
862	`if ( sClass.Compare(CShipData::ConvertShipClass(CShipData::GetShipClassFromNum(i))) )`	863	`if ( sClass.Compare(CShipData::ConvertShipClass(CShipData::GetShipClassFromNum(i)).ToString()) )`
863	`{`	864	`{`
864	`num = i;`	865	`num = i;`
865	`break;`	866	`break;`
866	`}`	867	`}`
867	`}`	868	`}`
868		869
869	`data = data.RepToken(";", TSHIPPOS_CLASS, CyString::Number(num));`	870	`data = data.replaceToken(";", TSHIPPOS_CLASS, (long)num);`
870	`}`	871	`}`
871		872
872	`return data;`	873	`return data;`
873	`}`	874	`}`
874		875
875	`CyString CXspFile::GetTCShipData()`	876	`Utils::String CXspFile::GetTCShipData()`
876	`{`	877	`{`
877	`CyString data = m_sData;`	878	`Utils::String data = m_sData;`
878		879
879	`CyString sSubType = data.GetToken(";", 6, 6);`	880	`Utils::String sSubType = data.token(";", 6);`
880	`if ( sSubType.ToInt() \|\| sSubType == "0" )`	881	`if ( ((long)sSubType) \|\| sSubType == "0" )`
881	`data = data.RepToken(";", 6, CShipData::ConvertShipSubType(sSubType.ToInt()));`	882	`data = data.replaceToken(";", 6, CShipData::ConvertShipSubType((long)sSubType).ToString());`
882		883
883	`CyString sClass = data.GetToken(";", TSHIPPOS_CLASS, TSHIPPOS_CLASS);`	884	`Utils::String sClass = data.token(";", TSHIPPOS_CLASS);`
884	`if ( sClass.ToInt() \|\| sClass == "0" )`	885	`if ( ((long)sClass) \|\| sClass == "0" )`
885	`data = data.RepToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass(sClass.ToInt()));`	886	`data = data.replaceToken(";", TSHIPPOS_CLASS, CShipData::ConvertShipClass((long)sClass).ToString());`
886		887
887	`return data;`	888	`return data;`
888	`}`	889	`}`
889		890
890	`bool CXspFile::RemoveCockpit(CyString cockpitid)`	891	`bool CXspFile::RemoveCockpit(const Utils::String &sCockpitId)`
891	`{`	892	`{`
-		893	`Utils::String cockpitid = sCockpitId;`
892	`// if its a whole line, just get the end`	894	`// if its a whole line, just get the end`
893	`if ( cockpitid.IsIn(";") )`	895	`if ( cockpitid.isin(";") )`
894	`{`	896	`{`
895	`cockpitid = cockpitid.GetToken(";", -2);`	897	`cockpitid = cockpitid.tokens(";", -2);`
896	`while ( cockpitid.Right(1) == ";" )`	898	`while ( cockpitid.right(1) == ";" )`
897	`cockpitid.Truncate((int)cockpitid.Length() - 1);`	899	`cockpitid.truncate(-1);`
898	`}`	900	`}`
899		901
900	`bool ret = false;`	902	`bool ret = false;`
901	`for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )`	903	`for ( CListNode<SCockpit> *node = m_lCockpit.Front(); node; node = node->next() )`
902	`{`	904	`{`
903	`CyString id = node->Data()->sCockpit.GetToken(";", 19, 19);`	905	`Utils::String id = node->Data()->sCockpit.token(";", 19);`
904	`if ( id.Compare(cockpitid) )`	906	`if ( id.Compare(cockpitid) )`
905	`{`	907	`{`
906	`node->DeleteData();`	908	`node->DeleteData();`
907	`ret = true;`	909	`ret = true;`
908	`break;`	910	`break;`
Line 912...	Line 914...
912	`m_lCockpit.RemoveEmpty();`	914	`m_lCockpit.RemoveEmpty();`
913		915
914	`return ret;`	916	`return ret;`
915	`}`	917	`}`
916		918
917	`bool CXspFile::RemoveComponent(CyString section1, CyString section2, CyString data)`	919	`bool CXspFile::RemoveComponent(const Utils::String &section1, const Utils::String &section2, const Utils::String &data)`
918	`{`	920	`{`
919	`bool ret = false;`	921	`bool ret = false;`
920	`for ( CListNode<SComponent> *node = m_lComponent.Front(); node; node = node->next() )`	922	`for ( CListNode<SComponent> *node = m_lComponent.Front(); node; node = node->next() )`
921	`{`	923	`{`
922	`if ( node->Data()->sSection.Compare(section1) && node->Data()->sSection2.Compare(section2) && node->Data()->sData.Compare(data) )`	924	`if ( node->Data()->sSection.Compare(section1) && node->Data()->sSection2.Compare(section2) && node->Data()->sData.Compare(data) )`
Line 928...	Line 930...
928	`}`	930	`}`

Subversion Repositories spk

(root)/libspk/src/XspFile.cpp – Rev 35 → 39