From 80765eb0a36f154134321abf7218378ea85450d4 Mon Sep 17 00:00:00 2001 From: beegee1 Date: Fri, 16 May 2014 19:22:21 +0200 Subject: [PATCH] - fixed clang compiler warnings (detects now unused constant vars) --- client/CMessage.cpp | 21 ++++++++++----------- client/mapHandler.cpp | 23 ++++++++++------------- client/mapHandler.h | 3 --- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/client/CMessage.cpp b/client/CMessage.cpp index d51528d51..25a046583 100644 --- a/client/CMessage.cpp +++ b/client/CMessage.cpp @@ -1,3 +1,13 @@ +/* + * CMessage.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ + #include "StdInc.h" #include "CMessage.h" @@ -13,17 +23,6 @@ #include "CBitmapHandler.h" #include "gui/CIntObjectClasses.h" -/* - * CMessage.cpp, part of VCMI engine - * - * Authors: listed in file AUTHORS in main folder - * - * License: GNU General Public License v2.0 or later - * Full text of license available in license.txt file, in main folder - * - */ - -const int COMPONENT_TO_SUBTITLE = 17; const int BETWEEN_COMPS_ROWS = 10; const int BEFORE_COMPONENTS = 30; const int BETWEEN_COMPS = 30; diff --git a/client/mapHandler.cpp b/client/mapHandler.cpp index 79308237d..39c30c543 100644 --- a/client/mapHandler.cpp +++ b/client/mapHandler.cpp @@ -1,3 +1,13 @@ +/* + * mapHandler.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ + #include "StdInc.h" #include "mapHandler.h" @@ -19,19 +29,6 @@ #include "CMT.h" #include "../lib/CRandomGenerator.h" -/* - * mapHandler.cpp, part of VCMI engine - * - * Authors: listed in file AUTHORS in main folder - * - * License: GNU General Public License v2.0 or later - * Full text of license available in license.txt file, in main folder - * - */ - -const bool MARK_BLOCKED_POSITIONS = false; -const bool MARK_VISITABLE_POSITIONS = false; - #define ADVOPT (conf.go()->ac) std::string nameFromType (int typ) diff --git a/client/mapHandler.h b/client/mapHandler.h index fb3178665..09d4eaae9 100644 --- a/client/mapHandler.h +++ b/client/mapHandler.h @@ -102,9 +102,6 @@ public: mutable std::map animationPhase; - static const bool MARK_BLOCKED_POSITIONS; - static const bool MARK_VISITABLE_POSITIONS; - CMapHandler(); //c-tor ~CMapHandler(); //d-tor