summaryrefslogtreecommitdiffstats
path: root/src/CBot/CBotDll.h
diff options
context:
space:
mode:
authorMichał Konopacki <konopacki.m@gmail.com>2012-08-13 01:26:36 +0200
committerMichał Konopacki <konopacki.m@gmail.com>2012-08-13 01:45:35 +0200
commite154e654f1e046a4d60e09d3ef87d1cf9c3ae6ae (patch)
tree049a2382a5bc8a611fe0ad3df25025eeb7293278 /src/CBot/CBotDll.h
parenta9186d19609c61c369d881cdbc40cc8973cf883d (diff)
downloadcolobot-e154e654f1e046a4d60e09d3ef87d1cf9c3ae6ae.tar.gz
colobot-e154e654f1e046a4d60e09d3ef87d1cf9c3ae6ae.tar.bz2
colobot-e154e654f1e046a4d60e09d3ef87d1cf9c3ae6ae.zip
Reduced amount of warnings in CBot library
Changed most of C-style casting to C++ casting Commented unused variables
Diffstat (limited to 'src/CBot/CBotDll.h')
-rw-r--r--src/CBot/CBotDll.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/CBot/CBotDll.h b/src/CBot/CBotDll.h
index c30125c..7af63ca 100644
--- a/src/CBot/CBotDll.h
+++ b/src/CBot/CBotDll.h
@@ -77,9 +77,10 @@ enum CBotType
//n = not implemented yet
// for SetUserPtr when deleting an object
-#define OBJECTDELETED ((void*)-1)
+// \TODO define own types to distinct between different states of objects
+#define OBJECTDELETED (reinterpret_cast<void*>(-1))
// value set before initialization
-#define OBJECTCREATED ((void*)-2)
+#define OBJECTCREATED (reinterpret_cast<void*>(-2))
/** \brief CBotTypResult class to define the complete type of a result*/
@@ -314,7 +315,7 @@ private:
int m_lg;
/** \brief Keeps the string corresponding to keyword ID */
- static const std::map<EID, char *> s_keywordString;
+ static const std::map<EID,const char *> s_keywordString;
/**
* \brief MapIdToString maps given ID to its string equivalent