diff --git a/projects/mtg/include/GameOptions.h b/projects/mtg/include/GameOptions.h index ba0e5aa7f..16eabf2cf 100644 --- a/projects/mtg/include/GameOptions.h +++ b/projects/mtg/include/GameOptions.h @@ -115,7 +115,6 @@ public: //optionally fallback to a file within a certain directory. //The sanity=false option returns the adjusted path even if the file doesn't exist. string profileFile(string filename="", string fallback="", bool sanity=true,bool relative=false); - string modeFile(string filename, string fallback, bool relative); void checkProfile(); void createUsersFirstDeck(int setId); diff --git a/projects/mtg/include/OptionItem.h b/projects/mtg/include/OptionItem.h index 47b2c8940..3abd6367e 100644 --- a/projects/mtg/include/OptionItem.h +++ b/projects/mtg/include/OptionItem.h @@ -29,6 +29,7 @@ public: virtual ostream& toString(ostream& out)const; OptionItem( string _id, string _displayValue); + virtual ~OptionItem() {}; virtual void Entering(); virtual bool Leaving(); diff --git a/projects/mtg/include/WResourceManager.h b/projects/mtg/include/WResourceManager.h index ff0fde374..38aeaba06 100644 --- a/projects/mtg/include/WResourceManager.h +++ b/projects/mtg/include/WResourceManager.h @@ -10,7 +10,13 @@ public: WResourceManager(); ~WResourceManager(); + //Wrapped from JResourceManager + void RemoveAll(){jrm->RemoveAll();} + void RemoveGraphics(){jrm->RemoveGraphics();} + void RemoveSound(){jrm->RemoveSound();} + void RemoveFont(){jrm->RemoveFont();} + int CreateTexture(const string &textureName); JTexture* GetTexture(const string &textureName); JTexture* GetTexture(int id); @@ -41,7 +47,7 @@ public: string graphicsFile(const string filename, const string specific = ""); string musicFile(const string filename, const string specific = ""); string sfxFile(const string filename, const string specific = ""); - bool fileOK(string filename, bool relative = false); + int fileOK(string filename, bool relative = false); private: JResourceManager * jrm;