diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-29 12:19:00 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-29 12:19:00 +0200 |
commit | e9660c47c69327a131c4e4b15bea4bdc7937fd61 (patch) | |
tree | c7edc252258b6149ad09fcf9ba609f1d8cb92ae0 /src/object/robotmain.h | |
parent | 677ce3960cd13cbf994311c76d75b343b22fd480 (diff) | |
parent | df4e3dfb6e623889757afe79fc4dfd29ae85748e (diff) | |
download | colobot-e9660c47c69327a131c4e4b15bea4bdc7937fd61.tar.gz colobot-e9660c47c69327a131c4e4b15bea4bdc7937fd61.tar.bz2 colobot-e9660c47c69327a131c4e4b15bea4bdc7937fd61.zip |
Merge branch 'dev' into dev-graphics
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); |