Subversion Repositories spk

Rev

Rev 121 | Rev 125 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 121 Rev 124
Line 203... Line 203...
203
	int GetCurrentGameFlags() { return m_iGameFlags; }
203
	int GetCurrentGameFlags() { return m_iGameFlags; }
204
 
204
 
205
	void SetCurrentDir(CyString dir) { m_sCurrentDir = dir; }
205
	void SetCurrentDir(CyString dir) { m_sCurrentDir = dir; }
206
 
206
 
207
	// merge mods
207
	// merge mods
208
	CyStringList *GetMergedFiles(CCatFile *cat1, CCatFile *cat2);
208
	void getMergedFiles(Utils::CStringList &list, CCatFile *cat1, CCatFile *cat2);
209
	bool CanWeMerge(const Utils::String &file) const;
209
	bool CanWeMerge(const Utils::String &file) const;
210
	bool MergeMods(CCatFile *mod1, CCatFile *mod2, CyString outFile, CyStringList *cantMerge);
210
	bool MergeMods(CCatFile *mod1, CCatFile *mod2, CyString outFile, CyStringList *cantMerge);
211
	bool NeedToMerge(CyString file);
211
	bool NeedToMerge(CyString file);
212
	CyStringList MergeTextFiles(CyStringList *files, CCatFile *mod1, CCatFile *mod2);
212
	CyStringList MergeTextFiles(CyStringList *files, CCatFile *mod1, CCatFile *mod2);
213
	bool GetModCompatabilityList(C_File *file, CyStringList *list = NULL);
213
	bool GetModCompatabilityList(C_File *file, CyStringList *list = NULL);