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

+{
 public:
 	CXspFile ();
 	~CXspFile () { this->Delete(); }
-	static bool ReadAnimations(CyStringList *lIn, CyStringList *lOut, int startRecord);
+	static bool ReadAnimations(const Utils::CStringList &lIn, Utils::CStringList &lOut, int startRecord);
 	static int GetAnimationType(const Utils::String &sType);
 	static Utils::String TypesListToString(Utils::CList<STypesSection> &list, bool deleteAfter = false);
 	bool WriteHeader(CFileIO &file, int iHeader, int iLength);
 	void SetShipData			(const Utils::String &sData ) { m_sData = sData; _changed(); }
 	void SetSceneFile ( C_File *f ) { m_pSceneFile = f; }
 	void SetCockpitFile ( C_File *f ) { m_pCockpitFile = f; }
-	void AddAnimation(CyStringList *list);
+	void addAnimation(const Utils::CStringList &list);
-	void AddAnimation(const Utils::String &;data) { m_lAnimations.PushBack(CyString(data), true); _changed(); }
+	void addAnimation(const Utils::String&; data);
-	void AddBodies(const Utils::String &data);
+	void addBodies(const Utils::String &data);
-	void AddBody(const Utils::String &section, const Utils::String &data);
+	void addBody(const Utils::String &section, const Utils::String &data);
 	void addCutData(const Utils::String& data);
 	void AddText(int id, const Utils::String &name, const Utils::String &desc );
 	void AddCockpit(const Utils::String &cockpit, int game, int mask = -1, int index = -1 );
 	void AddCockpitWeapon(const Utils::String &cockpit, int game, int mask);
 	void NewCockpit(const Utils::String &id, const Utils::String &scene, int mask );
 	void RemoveShipyard ( int s ) { m_iShipyard &= ~(s); _changed(); }
 	void SetShipyard(int s, bool b) { if ( b ) AddShipyard(s); else RemoveShipyard(s); }
 	void ToggleShipyard(int s) { if ( this->IsShipyard(s) ) RemoveShipyard(s); else AddShipyard(s); }
 	bool removeCutData(const Utils::String &cut);
-	bool RemoveCockpit(const Utils::String &cockpitid);
+	bool removeCockpit(const Utils::String &cockpitid);
-	bool RemoveComponent(const Utils::String &section1, const Utils::String &section2, const Utils::String &data);
+	bool removeComponent(const Utils::String &section1, const Utils::String &section2, const Utils::String &data);
-	bool RemoveDummy(const Utils::String &section, const Utils::String &data);
+	bool removeDummy(const Utils::String &section, const Utils::String &data);
-	bool RemoveBodies(const Utils::String &body);
+	bool removeBodies(const Utils::String &body);
-	bool RemoveAnimation(const Utils::String &ani);
+	bool removeAnimation(const Utils::String &ani);
 	bool IsSigned() { return false; }
 	bool IsValid ();
 	bool IsShipyard(int s) { return (m_iShipyard & s) ? true : false; }
 	bool AnyShipyards() { return (m_iShipyard > 0) ? true : false; }
 	virtual int GetType () { return TYPE_XSP; }
 	Utils::String GetShipName(int lang);
 	bool ConvertOld(const Utils::String &file);
-	CyStringList *GetAnimations() { return &m_lAnimations; }
+	const Utils::CStringList &getAnimations() const { return _lAnimations; }
 	const Utils::CStringList &getCutData() const { return _lCutData; }
-	CyStringList *GetBodies() { return &m_lBodies; }
+	const Utils::CStringList &getBodies() const { return _lBodies; }
 	CLinkList<SWeaponMask> *GetLaserMasks() { return &m_lWeaponMasks; }
 	CLinkList<SWeaponMask> *GetMissileMasks() { return &m_lMissileMasks; }
 	CLinkList<SText> *GetTexts() { return &m_lText; }
 	CLinkList<SDummy> *GetDummies() { return &m_lDummy; }
 	CLinkList<SComponent> *GetComponents() { return &m_lComponent; }
 	int GetLaserMask(int game, bool getOnly = false);
 	int GetMissileMask(int game, bool getOnly = false);
 	void SetLaserMask(int game, int mask);
 	void SetMissileMask(int game, int mask);
-	void SetCreatedShipData(CShipData *data) { m_sData = data->CreateData().ToString(); }
+	void SetCreatedShipData(CShipData *data) { m_sData = data->createData(); }
 	bool AnyTexts() { return !m_lText.empty(); }
 	bool AnyDummies() { return !m_lDummy.empty(); }
 	bool AnyComponents() { return !m_lComponent.empty(); }
 	bool AnyCockpits() { return !m_lCockpit.empty(); }
 	bool anyCutData() { return !_lCutData.empty(); }
-	bool AnyBodies() { return !m_lBodies.Empty(); }
+	bool anyBodies() const { return !_lBodies.empty(); }
-	bool AnyAnimations() { return !m_lAnimations.Empty(); }
+	bool anyAnimations() const { return !_lAnimations.empty(); }
 	void clearCutData();
+	void clearAnimations();
+	void clearBodies();
 	Utils::String GetShipClass();
 	bool UpdateSigned(bool updateFiles) { m_bSigned = false; return false; }
 	// ship extraction
 	bool startExtractShip(CVirtualFileSystem *pVfs, const Utils::String &sId, CProgressInfo *pProgress);
 	bool extractShip(CVirtualFileSystem *pVfs, const Utils::String &sId, CProgressInfo *progress);
 	bool extractSceneFiles(CVirtualFileSystem *pVfs);
-	void extractComponants(CVirtualFileSystem *pVfs, CyStringList *sceneModels);
+	void extractComponants(CVirtualFileSystem *pVfs, const Utils::CStringList &sceneModels);
-	void extractCutData(CVirtualFileSystem *pVfs, CyStringList *sceneModels, bool add);
+	void extractCutData(CVirtualFileSystem *pVfs, Utils::CStringList& sceneModels, bool add);
-	void extractDummies(CVirtualFileSystem *pVfs, CyStringList *sceneModels, bool add);
+	void extractDummies(CVirtualFileSystem *pVfs, Utils::CStringList& sceneModels, bool add);
 	void extractTextures(CVirtualFileSystem *pVfs);
-	bool extractBodies(CVirtualFileSystem *pVfs, CyStringList *sceneModels);
+	bool extractBodies(CVirtualFileSystem *pVfs, const Utils::CStringList& sceneModels);
 	bool extractCockpits(CVirtualFileSystem *pVfs);
 	void addComponentsToList(CLinkList<SComponentEntry> &componentList);
 	void addDummiesToList(Utils::CList<STypesSection> &list);
 	void addCutDataToList(Utils::CList<STypesSection> &list);
 	void addBodiesToList(Utils::CList<STypesSection> &list);
 	void addAnimationsToList(Utils::CList<STypesSection> &list);
-	bool processSceneFileSection(int section, CVirtualFileSystem *pVfs, CyStringList *lModels, CProgressInfo *progress);
+	bool processSceneFileSection(int section, CVirtualFileSystem *pVfs, Utils::CStringList &lModels, CProgressInfo *progress);
 	bool processSceneFiles(CVirtualFileSystem *pVfs, CProgressInfo *progress);
 	void PackAllFiles();
-	CyStringList *ReadSceneModels();
+	bool readSceneModels(Utils::CStringList& out);
 	//TODO: convert this
 	void ExtractTexts(CCatFile *catFile, CCatFile *secondCatFile, int textId);
-	bool GetTextureList(CyStringList *list, const unsigned char *olddata, size_t size);
+	bool getTextureList(Utils::CStringList &list, const unsigned char *olddata, size_t size) const;
 	bool AddTextFromFile(const Utils::String &file, int textId = -1);
-	bool ImportBodies(CyStringList *sceneModels, const Utils::String &filename);
+	bool importBodies(const Utils::CStringList &sceneModels, const Utils::String &filename);
 	bool ImportCockpits(const Utils::String &filename);
-	Utils::String FormatShipData(CyStringList *cockpits, int *text, int game);
+	Utils::String formatShipData(const Utils::CStringList &cockpits, int *text, int game);
 	virtual bool LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons, CProgressInfo *progress = NULL) override;
 	virtual bool GeneratePackagerScript(bool wildcard, Utils::CStringList *list, int game, const Utils::CStringList &gameAddons, bool datafile = false) override;
 	virtual void addGeneratedFiles(HZIP &hz);
 	virtual void Delete ();
 	virtual void SetDefaults ();
 	virtual bool CheckHeader(const Utils::String header) const;
 	SCockpit *_findCockpit(const Utils::String &sID);
 	void _addSection(Utils::CList<STypesSection> &list, const Utils::String &section, const Utils::String &data);
-	void _addDataSection(CyStringList& list, Utils::CList<STypesSection>& sectionList, bool bUseFirst);
 	void _addDataSection(Utils::CStringList& list, Utils::CList<STypesSection>& sectionList, bool bUseFirst);
 	bool _addTextFromFile(CFileIO &F, int textId = -1);
 protected:
 	C_File *m_pSceneFile, *m_pCockpitFile;
 	Utils::String m_sID;
 	Utils::String m_sData;
 	Utils::CStringList		_lCutData;
-	CyStringList			m_lBodies;
+	Utils::CStringList		_lBodies;
-	CyStringList			m_lAnimations;
+	Utils::CStringList		_lAnimations;
 	CLinkList<SCockpit>		m_lCockpit;
 	CLinkList<SText>		m_lText;
 	CLinkList<SComponent>	m_lComponent;
 	CLinkList<SDummy>		m_lDummy;
 	CLinkList<SWeaponMask>  m_lWeaponMasks;

Subversion Repositories spk

(root)/libspk/src/XspFile.h – Rev 166 → 170