diff options
author | unknown <zawadzki@3F13H4J.nsn-intra.net> | 2012-09-28 20:17:56 +0200 |
---|---|---|
committer | unknown <zawadzki@3F13H4J.nsn-intra.net> | 2012-09-28 20:17:56 +0200 |
commit | 38ebf4c3989a600cf5e9cf89be648d9b3373bc7c (patch) | |
tree | a7175abaac0db19f86c952a0ef051f3777eaffa5 /src/object/robotmain.h | |
parent | 099f6c4f0b472840ae38aed1042db32481cc142d (diff) | |
parent | cc9a5070544bbac127df45ca73810a03ed2fa9d2 (diff) | |
download | colobot-38ebf4c3989a600cf5e9cf89be648d9b3373bc7c.tar.gz colobot-38ebf4c3989a600cf5e9cf89be648d9b3373bc7c.tar.bz2 colobot-38ebf4c3989a600cf5e9cf89be648d9b3373bc7c.zip |
Merge branch 'master' of https://github.com/colobot/colobot into dev
Diffstat (limited to 'src/object/robotmain.h')
-rw-r--r-- | src/object/robotmain.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/object/robotmain.h b/src/object/robotmain.h index 0a5a5a2..8724b90 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -295,9 +295,9 @@ public: bool GetSceneSoluce(); bool GetShowAll(); bool GetCheatRadar(); - char* GetSavegameDir(); - char* GetPublicDir(); - char* GetFilesDir(); + const char* GetSavegameDir(); + const char* GetPublicDir(); + const char* GetFilesDir(); void SetGamerName(const char *name); char* GetGamerName(); @@ -324,10 +324,10 @@ public: void CompileScript(bool soluce); void LoadOneScript(CObject *pObj, int &nerror); - void LoadFileScript(CObject *pObj, char* filename, int objRank, int &nerror); + void LoadFileScript(CObject *pObj, const char* filename, int objRank, int &nerror); void SaveAllScript(); void SaveOneScript(CObject *pObj); - void SaveFileScript(CObject *pObj, char* filename, int objRank); + void SaveFileScript(CObject *pObj, const char* filename, int objRank); bool SaveFileStack(CObject *pObj, FILE *file, int objRank); bool ReadFileStack(CObject *pObj, FILE *file, int objRank); @@ -339,10 +339,10 @@ public: void ReadFreeParam(); bool IsBusy(); - bool IOWriteScene(char *filename, char *filecbot, char *info); - CObject* IOReadScene(char *filename, char *filecbot); + bool IOWriteScene(const char *filename, const char *filecbot, char *info); + CObject* IOReadScene(const char *filename, const char *filecbot); void IOWriteObject(FILE *file, CObject* pObj, const char *cmd); - CObject* IOReadObject(char *line, char* filename, int objRank); + CObject* IOReadObject(char *line, const char* filename, int objRank); int CreateSpot(Math::Vector pos, Gfx::Color color); |