浏览代码

removed few more includes from headers

Ivan Savenko 10 年之前
父节点
当前提交
7189a12df2
共有 8 个文件被更改,包括 3 次插入12 次删除
  1. 1 0
      AI/VCAI/AIUtility.cpp
  2. 0 2
      AI/VCAI/AIUtility.h
  3. 1 0
      AI/VCAI/VCAI.cpp
  4. 0 2
      AI/VCAI/VCAI.h
  5. 0 3
      lib/BattleState.h
  6. 1 1
      lib/Connection.h
  7. 0 2
      lib/registerTypes/RegisterTypes.h
  8. 0 2
      server/CGameHandler.h

+ 1 - 0
AI/VCAI/AIUtility.cpp

@@ -10,6 +10,7 @@
 #include "../../lib/mapObjects/CGTownInstance.h"
 #include "../../lib/mapObjects/CQuest.h"
 #include "../../lib/CPathfinder.h"
+#include "../../lib/mapping/CMapDefines.h"
 
 /*
  * AIUtility.cpp, part of VCMI engine

+ 0 - 2
AI/VCAI/AIUtility.h

@@ -6,8 +6,6 @@
 #include "../../lib/CTownHandler.h"
 #include "../../lib/spells/CSpellHandler.h"
 #include "../../lib/Connection.h"
-//#include "../../lib/CGameState.h"
-#include "../../lib/NetPacks.h"
 #include "../../lib/CStopWatch.h"
 
 /*

+ 1 - 0
AI/VCAI/VCAI.cpp

@@ -9,6 +9,7 @@
 #include "../../lib/CHeroHandler.h"
 #include "../../lib/CModHandler.h"
 #include "../../lib/CGameState.h"
+#include "../../lib/NetPacks.h"
 
 
 /*

+ 0 - 2
AI/VCAI/VCAI.h

@@ -15,8 +15,6 @@
 #include "../../lib/mapObjects/MiscObjects.h"
 #include "../../lib/spells/CSpellHandler.h"
 #include "../../lib/Connection.h"
-//#include "../../lib/CGameState.h"
-#include "../../lib/NetPacks.h"
 #include "../../lib/CondSh.h"
 
 struct QuestInfo;

+ 0 - 3
lib/BattleState.h

@@ -11,12 +11,9 @@
 #pragma once
 
 #include "BattleHex.h"
-#include "HeroBonus.h"
-#include "CCreatureSet.h"
 #include "mapObjects/CArmedInstance.h" // for army serialization
 #include "mapObjects/CGHeroInstance.h" // for commander serialization
 #include "CCreatureHandler.h"
-#include "CObstacleInstance.h"
 #include "ConstTransitivePtr.h"
 #include "GameConstants.h"
 #include "CBattleCallback.h"

+ 1 - 1
lib/Connection.h

@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include <typeinfo> //XXX this is in namespace std if you want w/o use typeinfo.h?
+#include <typeinfo>
 #include <type_traits>
 
 #include <boost/mpl/eval_if.hpp>

+ 0 - 2
lib/registerTypes/RegisterTypes.h

@@ -24,8 +24,6 @@
  *
  */
 
-
-
 template<typename Serializer>
 void registerTypesMapObjects1(Serializer &s)
 {

+ 0 - 2
server/CGameHandler.h

@@ -2,11 +2,9 @@
 
 
 #include "../lib/FunctionList.h"
-//#include "../lib/CGameState.h"
 #include "../lib/Connection.h"
 #include "../lib/IGameCallback.h"
 #include "../lib/BattleAction.h"
-#include "../lib/NetPacks.h"
 #include "CQuery.h"