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

 	if ( !m_sID.empty() )
+	{
 		list->PushBack("# Ship ID, the ship id to identify the ship as");
 		list->PushBack(CyString("ShipID: ") + m_sID);
+	}
+	if ( m_bExistingShip )
+	{
+		list->PushBack("# Existing Ship, replaces an existing ship in the game with ship package instead of creating a new entry");
+		list->PushBack("ExistingShip");
+		list->PushBack("");
+	}
 	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(CyString("ShipData: ") + m_sData);
 		list->PushBack("");
+	}
-	if ( m_bExistingShip )
+	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(CyString("ShipText: ") + (long)node->Data()->iId + " " + node->Data()->sName + "|" + node->Data()->sDesc);
+		}
+		list->PushBack("");
-	{
+	}
+	if ( this->m_lWeaponMasks.size() ) {
+		list->PushBack("# Weapon Masks, the weapons for each game: <GAME> <MASK>");
+		for(CListNode<SWeaponMask> *node = m_lWeaponMasks.Front(); node; node = node->next()) {
+			list->PushBack(CyString("WeaponMask: ") + (long)node->Data()->iGame + " " + (long)node->Data()->iMask);
+		}
+		list->PushBack("");
+	}
+	if ( this->m_lMissileMasks.size() ) {
+		list->PushBack("# Missile Masks, the missiles for each game: <GAME> <MASK>");
+		for(CListNode<SWeaponMask> *node = m_lMissileMasks.Front(); node; node = node->next()) {
+			list->PushBack(CyString("WeaponMask: ") + (long)node->Data()->iGame + " " + (long)node->Data()->iMask);
+		}
+		list->PushBack("");
+	}
+	if ( this->m_lComponent.size() ) {
-		list->PushBack("# Existing Ship, replaces an existing ship in the game with ship package instead of creating a new entry");
+		list->PushBack("# Ship Components, each component used in the ships scene: <SECTION> <MODELENTRY> <VALUES>");
+		for(CListNode<SComponent> *node = m_lComponent.Front(); node; node = node->next()) {
+			list->PushBack(CyString("Component: ") + node->Data()->sSection + " " + node->Data()->sSection2 + " " + node->Data()->sData);
+		}
+		list->PushBack("");
+	}
+	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(CyString("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(CyString("Cockpit: ") + node->Data()->sCockpit.token(";", 19) + " " + node->Data()->sCockpit);
+			for(SWeaponMask *mask = node->Data()->lWeaponMask.First(); mask; mask = node->Data()->lWeaponMask.Next()) {
+				list->PushBack(CyString("CockpitWeapon: ") + node->Data()->sCockpit.token(";", 19) + " " + (long)mask->iGame + " " + (long)mask->iMask);
+			}
+		}
+		list->PushBack("");
+	}
+	if ( !this->m_lCutData.Empty() ) {
+		list->PushBack("# Ship Cut Data");
+		for(SStringList *str = m_lCutData.Head(); str; str = str->next) {
+			list->PushBack(CyString("CutData: ") + str->str);
+		}
+		list->PushBack("");
+	}
+	if ( !this->m_lBodies.Empty() ) {
-		list->PushBack("ExistingShip");
+		list->PushBack("# Ship Bodies");
+		for(SStringList *str = m_lBodies.Head(); str; str = str->next) {
+			list->PushBack(CyString("Bodies: ") + str->str);
+		}
+		list->PushBack("");
+	}
+	if ( !this->m_lAnimations.Empty() ) {
+		list->PushBack("# Ship Animations");
+		for(SStringList *str = m_lAnimations.Head(); str; str = str->next) {
+			list->PushBack(CyString("Animation: ") + str->str);
+		}
 		list->PushBack("");
+	}
 	if ( !datafile )
+	{
+	}
 	else if ( sFirst.Compare("ExistingShip") )
 		m_bExistingShip = true;
 	else if ( sFirst.Compare("ShipID") )
 		m_sID = sRest;
+	else if ( sFirst.Compare("ShipText") )
+		this->AddText(sRest.token(" ", 1).toLong(), sRest.tokens(" ", 2).token("|", 1), sRest.tokens(" ", 2).tokens("|", 2));
+	else if ( sFirst.Compare("Component") )
+		this->AddComponent(sRest.token(" ", 1), sRest.token(" ", 2), sRest.tokens(" ", 3));
+	else if ( sFirst.Compare("Cockpit") )
+		this->AddCockpit(sRest.tokens(" ", 2).replaceToken(";", 19, sRest.token(" ", 1)), 0);
+	else if ( sFirst.Compare("CockpitWeapon") )
+		this->AddCockpitWeapon(sRest.token(" ", 1), sRest.token(" ", 2), sRest.token(" ", 3));
+	else if ( sFirst.Compare("WeaponMask") )
+		this->AddWeaponMask(sRest.token(" ", 1), sRest.token(" ", 2));
+	else if ( sFirst.Compare("MissileMask") )
+		this->AddMissileMask(sRest.token(" ", 1), sRest.token(" ", 2));
+	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) )
+	{
 		return false;
+	}
 			if ( sClass.Compare(CShipData::ConvertShipClass(CShipData::GetShipClassFromNum(i))) )
+			{
 				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));
 	return data;
+}
 bool CXspFile::RemoveCockpit(const Utils::String &sCockpitId)
+{
 	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;
+		}
+	}
 	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() )
+{
 	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('\n'))) )
+		{
+			ret = true;
+			str->remove = true;
+			break;
+		}
+	}
+	m_lAnimations.RemoveMarked();
 	return ret;
+}
-bool CXspFile::RemoveAnimation(const Utils::String &cut)
+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();
+	}
+	return NULL;
+}
+void CXspFile::AddCockpitWeapon(const Utils::String &cockpit, int game, int mask)
+{
+	SCockpit *pCockpit = _findCockpit(cockpit);
+	// search if the game mask already exists
-	bool ret = false;
+	SWeaponMask *wm = NULL;
-	for ( SStringList *str = m_lAnimations.Head(); str; str = str->next )
+	for ( CListNode<SWeaponMask> *node = pCockpit->lWeaponMask.Front(); node; node = node->next() )
+	{
-		if ( str->str.Remove(&apos; ').Remove('\n').Compare(CyString(cut.remove(' ').remove('\n&apos;))) )
+		if ( node->Data()-&gt;iGame == game )
+		{
-			ret = true;
-			str->remove = true;
+			wm = node->Data();
 			break;
+		}
 	}
+	if ( !wm )
+	{
+		wm = new SWeaponMask;
-	m_lAnimations.RemoveMarked();
+		pCockpit->lWeaponMask.push_back(wm);
+	}
+	wm->iGame = game;
+	if ( mask == -1 )
+		wm->iMask = pCockpit->sCockpit.token(";", 9);
+	else
+		wm->iMask = mask;
-	return ret;
+	_changed();
+}
 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();
+	SCockpit *pCockpit = _findCockpit(cid);
-			break;
-		}
-	}
 	if ( !pCockpit )
+	{
 		pCockpit = new SCockpit;
 		pCockpit->sCockpit = cockpit;
 		pCockpit->iIndex = index;
 	if ( index != -1 )
 		pCockpit->iIndex = index;
 	// now add the game mask
 	if ( game > 0 )
-	{
-		// search if the game mask already exists
-		SWeaponMask *wm = NULL;
-		for ( CListNode<SWeaponMask> *node = pCockpit->lWeaponMask.Front(); node; node = node->next() )
-		{
-			if ( node->Data()->iGame == game )
-			{
-				wm = node->Data();
-				break;
-			}
-		}
-		if ( !wm )
-		{
-			wm = new SWeaponMask;
-			pCockpit->lWeaponMask.push_back(wm);
+		AddCockpitWeapon(cid, game, mask);
-		}
-		wm->iGame = game;
-		if ( mask == -1 )
-			wm->iMask = cockpit.token(";", 9);
-		else
-			wm->iMask = mask;
-	}
 	_changed();
+}
 void CXspFile::AddBody(const Utils::String &section, const Utils::String &data)
+{
 		SInCatFile *f = node->Data();
 		if ( !f->sFile.Left(2).Compare("t\\") && !f->sFile.Left(2).Compare("t/") )
 			continue;
 		// extract the text file and read in the data
-		bool extracted = catFile->ExtractFile(f->sFile, CPackages::GetTempDirectory() + "tmp.dat");
+		bool extracted = catFile->ExtractFile(f->sFile, CPackages::GetTempDirectory() + "/tmp.dat");
-		if ( !extracted && secondCatFile ) extracted = secondCatFile->ExtractFile(f->sFile, CPackages::GetTempDirectory() + "tmp.dat");
+		if ( !extracted && secondCatFile ) extracted = secondCatFile->ExtractFile(f->sFile, CPackages::GetTempDirectory() + "/tmp.dat");
 		if ( extracted ) {
-			this->AddTextFromFile(CPackages::tempDirectory() + "tmp.dat", textId);
+			this->AddTextFromFile(CPackages::tempDirectory() + "/tmp.dat", textId);
-			CFileIO::Remove(CPackages::tempDirectory() + "tmp.dat");
+			CFileIO::Remove(CPackages::tempDirectory() + "/tmp.dat");
+		}
+	}
+}
 bool CXspFile::processSceneFileSection(int section, CVirtualFileSystem *pVfs, CyStringList *lModels, CProgressInfo *progress)

Subversion Repositories spk

(root)/libspk/src/XspFile.cpp – Rev 102 → 108