diff options
author | Zaba999 <zaba.marcin@gmail.com> | 2012-09-18 00:01:00 +0200 |
---|---|---|
committer | Zaba999 <zaba.marcin@gmail.com> | 2012-09-18 00:01:00 +0200 |
commit | a397922e8d53c6f7ff469d38e5139fd003c705b5 (patch) | |
tree | 8f6e92a0ac59d655e5fcc48bd198aa1bae25f0db /src/script/cbottoken.cpp | |
parent | 844e11db4f394004258cdca8f8fd8bc95c41a985 (diff) | |
download | colobot-a397922e8d53c6f7ff469d38e5139fd003c705b5.tar.gz colobot-a397922e8d53c6f7ff469d38e5139fd003c705b5.tar.bz2 colobot-a397922e8d53c6f7ff469d38e5139fd003c705b5.zip |
warnings fight in progress.
Diffstat (limited to 'src/script/cbottoken.cpp')
-rw-r--r-- | src/script/cbottoken.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/script/cbottoken.cpp b/src/script/cbottoken.cpp index a9cc599..0bb368c 100644 --- a/src/script/cbottoken.cpp +++ b/src/script/cbottoken.cpp @@ -24,7 +24,7 @@ // Seeking the name of an object. -char* GetObjectName(ObjectType type) +const char* GetObjectName(ObjectType type) { if ( type == OBJECT_PORTICO ) return "Portico"; if ( type == OBJECT_BASE ) return "SpaceShip"; @@ -117,7 +117,7 @@ char* GetObjectName(ObjectType type) // Seeking the name of a secondary object. // (because Otto thinks that Germans do not like nuclear power) -char* GetObjectAlias(ObjectType type) +const char* GetObjectAlias(ObjectType type) { if ( type == OBJECT_NUCLEAR ) return "FuelCellPlant"; if ( type == OBJECT_URANIUM ) return "PlatinumOre"; @@ -130,7 +130,7 @@ char* GetObjectAlias(ObjectType type) // Returns the help file to use for the object. -char* GetHelpFilename(ObjectType type) +const char* GetHelpFilename(ObjectType type) { if ( type == OBJECT_BASE ) return "help\\object\\base.txt"; if ( type == OBJECT_DERRICK ) return "help\\object\\derrick.txt"; @@ -215,7 +215,7 @@ char* GetHelpFilename(ObjectType type) // Returns the help file to use for instruction. -char* GetHelpFilename(const char *token) +const char* GetHelpFilename(const char *token) { if ( strcmp(token, "if" ) == 0 ) return "help\\cbot\\if.txt"; if ( strcmp(token, "else" ) == 0 ) return "help\\cbot\\if.txt"; @@ -427,7 +427,7 @@ bool IsFunction(const char *token) // Returns using a compact instruction. -char* GetHelpText(const char *token) +const char* GetHelpText(const char *token) { if ( strcmp(token, "if" ) == 0 ) return "if ( condition ) { bloc }"; if ( strcmp(token, "else" ) == 0 ) return "else { bloc }"; |