ソースを参照

- fixed clang compiler warnings (detects now unused constant vars)

beegee1 11 年 前
コミット
80765eb0a3
3 ファイル変更20 行追加27 行削除
  1. 10 11
      client/CMessage.cpp
  2. 10 13
      client/mapHandler.cpp
  3. 0 3
      client/mapHandler.h

+ 10 - 11
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;

+ 10 - 13
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)

+ 0 - 3
client/mapHandler.h

@@ -102,9 +102,6 @@ public:
 
 	mutable std::map<const CGObjectInstance*, ui8> animationPhase;
 
-	static const bool MARK_BLOCKED_POSITIONS;
-	static const bool MARK_VISITABLE_POSITIONS;
-
 	CMapHandler(); //c-tor
 	~CMapHandler(); //d-tor