1

server/gameserver/android.cc

@@ -5,6 +5,7 @@
 #include "app.h"
 #include "android_agent.h"
 #include "movehelper.h"
+#include "battledatacontext.h"
 
 #include "f8/btmgr.h"
 

server/gameserver/battledatacontext.cc

@@ -12,6 +12,8 @@
 #include "room.h"
 #include "explosion.h"
 #include "roommgr.h"
+#include "ability.h"
+
 #include "mt/Param.h"
 #include "mt/Item.h"
 #include "mt/Hero.h"

server/gameserver/buff.cc

@@ -14,11 +14,12 @@
 #include "skillhelper.h"
 #include "trigger.h"
 #include "virtualbullet.h"
+#include "ability.h"
 #include "bullet.h"
-#include "mt/Param.h"
 #include "glmhelper.h"
 #include "pbutils.h"
 
+#include "mt/Param.h"
 #include "mt/Buff.h"
 #include "mt/Skill.h"
 #include "mt/SkillNumber.h"

server/gameserver/bullet.cc

@@ -18,6 +18,7 @@
 #include "creature.h"
 #include "skillhelper.h"
 #include "trigger.h"
+#include "ability.h"
 
 #include "mt/Param.h"
 #include "mt/Equip.h"

server/gameserver/car.cc

@@ -18,6 +18,8 @@
 #include "glmhelper.h"
 #include "pbutils.h"
 #include "trigger.h"
+#include "ability.h"
+#include "battledatacontext.h"
 
 #include "mt/Hero.h"
 #include "mt/Equip.h"

server/gameserver/creature.cc

@@ -16,6 +16,8 @@
 #include "shot.h"
 #include "movehelper.h"
 #include "trigger.h"
+#include "ability.h"
+#include "battledatacontext.h"
 
 #include "mt/Param.h"
 #include "mt/Hero.h"

server/gameserver/creature.h

@@ -2,9 +2,7 @@
 
 #include "moveableentity.h"
 #include "buff.h"
-#include "ability.h"
 #include "weapon.h"
-#include "battledatacontext.h"
 
 namespace cs
 {
@@ -52,6 +50,8 @@ struct HumanAbility
     float fire_rate = 0.0f;
 };
 
+struct BattleDataContext;
+class Ability;
 class Skill;
 class Obstacle;
 class RoomObstacle;

server/gameserver/hero.cc

@@ -16,6 +16,7 @@
 #include "app.h"
 #include "pbutils.h"
 #include "trigger.h"
+#include "battledatacontext.h"
 
 #include "mt/Hero.h"
 #include "mt/Equip.h"

server/gameserver/human.cc

@@ -40,6 +40,7 @@
 #include "movehelper.h"
 #include "pbutils.h"
 #include "trigger.h"
+#include "ability.h"
 
 #include "mt/Param.h"
 #include "mt/Hero.h"

server/gameserver/obstacle.cc

@@ -15,6 +15,7 @@
 #include "explosion.h"
 #include "entityfactory.h"
 #include "pbutils.h"
+#include "battledatacontext.h"
 
 #include "mt/Equip.h"
 #include "mt/MapThing.h"

server/gameserver/player.cc

@@ -27,6 +27,7 @@
 #include "roommgr.h"
 #include "movehelper.h"
 #include "trigger.h"
+#include "ability.h"
 
 #include "mt/Param.h"
 #include "mt/Equip.h"

server/gameserver/roomobstacle.cc

@@ -15,6 +15,8 @@
 #include "player.h"
 #include "incubator.h"
 #include "skillhelper.h"
+#include "ability.h"
+#include "battledatacontext.h"
 
 #include "mt/MapThing.h"
 #include "mt/Skill.h"

server/gameserver/skill.cc

@@ -12,6 +12,8 @@
 #include "bullet.h"
 #include "collider.h"
 #include "pbutils.h"
+#include "ability.h"
+#include "battledatacontext.h"
 
 #include "mt/Buff.h"
 #include "mt/Skill.h"

server/gameserver/skillhelper.cc

@@ -7,6 +7,8 @@
 #include "skill.h"
 #include "room.h"
 #include "roomobstacle.h"
+#include "ability.h"
+#include "battledatacontext.h"
 
 #include "mt/Buff.h"
 #include "mt/Skill.h"

server/gameserver/team.cc

@@ -5,6 +5,7 @@
 #include "human.h"
 #include "room.h"
 #include "app.h"
+#include "battledatacontext.h"
 
 void Team::TraverseMembers(std::function<bool (Human*)> func)
 {