summaryrefslogtreecommitdiff
path: root/GUI.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2011-07-22 01:56:16 +0000
committerPetr Mrázek2011-07-22 01:56:16 +0000
commit9b364f1cd23dc74b96809f77e45ba3397a646e7a (patch)
tree914e8d1f7ece1606d75e1e35bf443689b05b0ffb /GUI.cpp
parentbf89e3ad6b98442dca909e327b80c5e292db6092 (diff)
downloadstonesense-9b364f1cd23dc74b96809f77e45ba3397a646e7a.tar.gz
stonesense-9b364f1cd23dc74b96809f77e45ba3397a646e7a.tar.bz2
stonesense-9b364f1cd23dc74b96809f77e45ba3397a646e7a.tar.xz
Const correctness of string constant handling, some other warnings fixed.
Diffstat (limited to 'GUI.cpp')
-rw-r--r--GUI.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/GUI.cpp b/GUI.cpp
index c018710..87891e9 100644
--- a/GUI.cpp
+++ b/GUI.cpp
@@ -365,7 +365,7 @@ void drawDebugCursorAndInfo(){
int ttype;
- char* tform = NULL;
+ const char* tform = NULL;
if (b->floorType>0)
{
ttype=b->floorType;
@@ -373,18 +373,18 @@ void drawDebugCursorAndInfo(){
}
else if (b->wallType > 0)
{
- ttype=b->wallType;
- tform="wall";
+ ttype=b->wallType;
+ tform="wall";
}
else if (b->ramp.type > 0)
{
- ttype=b->ramp.type;
- tform="ramp";
+ ttype=b->ramp.type;
+ tform="ramp";
}
else if (b->stairType > 0)
{
- ttype=b->stairType;
- tform="stair";
+ ttype=b->stairType;
+ tform="stair";
}
if (tform != NULL)
@@ -915,7 +915,7 @@ inline int returnGreater(int a, int b)
else return b;
}
-int loadImgFile(char* filename)
+int loadImgFile(const char* filename)
{
if(config.cache_images)
{