summaryrefslogtreecommitdiffstats
path: root/src/object
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2013-06-22 01:11:37 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2013-06-22 01:17:19 +0200
commitbfcce26f8949f4ba42cc1bd8203dff51884aa0da (patch)
treed53c83fa8079952a9226589caf98075cd0623958 /src/object
parent1377e48910c1bef1829c67740360b0a8309239a1 (diff)
downloadcolobot-bfcce26f8949f4ba42cc1bd8203dff51884aa0da.tar.gz
colobot-bfcce26f8949f4ba42cc1bd8203dff51884aa0da.tar.bz2
colobot-bfcce26f8949f4ba42cc1bd8203dff51884aa0da.zip
Changes in build organization
* targets are now created in top-level build directory * more things are now configured through CMake options * changed debug build detection from NDEBUG to DEV_BUILD * moved po and desktop directories * moved last unit test out of src directory
Diffstat (limited to 'src/object')
-rw-r--r--src/object/robotmain.cpp8
-rw-r--r--src/object/robotmain.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 7eaa3f6..b58e5f8 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -669,11 +669,13 @@ CRobotMain::CRobotMain(CApplication* app, bool loadProfile)
m_showPos = false;
m_selectInsect = false;
m_showSoluce = false;
- #ifdef NDEBUG
- m_showAll = false;
- #else
+
+ #if DEV_BUILD
m_showAll = true; // for development
+ #else
+ m_showAll = false;
#endif
+
m_cheatRadar = false;
m_fixScene = false;
m_trainerPilot = false;
diff --git a/src/object/robotmain.h b/src/object/robotmain.h
index 04efea7..525e5df 100644
--- a/src/object/robotmain.h
+++ b/src/object/robotmain.h
@@ -192,7 +192,7 @@ class CRobotMain : public CSingleton<CRobotMain>
{
public:
CRobotMain(CApplication* app, bool loadProfile);
- ~CRobotMain();
+ virtual ~CRobotMain();
Gfx::CCamera* GetCamera();
Gfx::CTerrain* GetTerrain();