1

server/gameserver/android.cc

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

server/gameserver/buff/callfunc.cc

@@ -12,7 +12,7 @@
 #include "human.h"
 #include "team.h"
 #include "collision.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 #include "hero.h"
 #include "obstacle.h"
 

server/gameserver/car.cc

@@ -18,7 +18,7 @@
 #include "pbutils.h"
 #include "trigger.h"
 #include "ability.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 #include "buff.h"
 #include "stats.h"
 #include "hero.h"

server/gameserver/creature.cc

@@ -20,7 +20,7 @@
 #include "movement.h"
 #include "trigger.h"
 #include "ability.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 #include "buff.h"
 #include "mapinstance.h"
 #include "collision.h"

server/gameserver/gungrasp.cc

@@ -2,7 +2,7 @@
 
 #include "gungrasp.h"
 #include "creature.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 #include "trigger.h"
 #include "room.h"
 #include "effect.h"

server/gameserver/hero.cc

@@ -15,7 +15,7 @@
 #include "app.h"
 #include "pbutils.h"
 #include "trigger.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 #include "stats.h"
 #include "hero_agent.h"
 #include "movement.h"

server/gameserver/human.cc

@@ -34,7 +34,7 @@
 #include "httpproxy.h"
 #include "skillhelper.h"
 #include "shot.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 #include "mapinstance.h"
 #include "movement.h"
 #include "pbutils.h"

server/gameserver/lispenv.cc

@@ -2,7 +2,7 @@
 
 #include "lispenv.h"
 #include "buff.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 #include "creature.h"
 #include "glmhelper.h"
 #include "room.h"

server/gameserver/matchteam.h

@@ -2,7 +2,7 @@
 
 #include <f8/timer.h>
 
-#include "battledatacontext.h"
+#include "netdata.h"
 
 namespace cs
 {

server/gameserver/matchteamnew.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "battledatacontext.h"
+#include "netdata.h"
 
 #include "matchteam.h"
 

server/gameserver/netdata.cc

@@ -2,7 +2,7 @@
 
 #include <math.h>
 
-#include "battledatacontext.h"
+#include "netdata.h"
 
 #include "human.h"
 #include "creature.h"

server/gameserver/obstacle.cc

@@ -14,7 +14,7 @@
 #include "explosion.h"
 #include "entityfactory.h"
 #include "pbutils.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 
 #include "mt/Equip.h"
 #include "mt/MapThing.h"
@@ -211,12 +211,7 @@ void Obstacle::OnExplosionHit(Explosion* e)
 
     float dmg = e->GetDmg();
     float def = 0;
-    // 999
-    #if 1
     float finaly_dmg = dmg;
-    #else
-    float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K);
-    #endif
     SetHealth(e->GetRoom(), std::max(0.0f, GetHealth(e->GetRoom()) - finaly_dmg));
     if (GetHealth(e->GetRoom()) <= 0.01f) {
         Die(e->GetRoom());

server/gameserver/roommgr.h

@@ -6,7 +6,7 @@
 #include <f8/protoutils.h>
 #include <f8/timer.h>
 
-#include "battledatacontext.h"
+#include "netdata.h"
 namespace cs
 {
     class CMJoin;

server/gameserver/roomobstacle.cc

@@ -15,7 +15,7 @@
 #include "incubator.h"
 #include "skillhelper.h"
 #include "ability.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 #include "collision.h"
 
 #include "mt/MapThing.h"

server/gameserver/shot.cc

@@ -12,7 +12,7 @@
 #include "buff.h"
 #include "debugcmd.h"
 #include "ability.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 
 #include "mt/Param.h"
 #include "mt/Hero.h"

server/gameserver/skill.cc

@@ -15,7 +15,7 @@
 #include "collision.h"
 #include "pbutils.h"
 #include "ability.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 #include "collision.h"
 #include "shot.h"
 #include "movement.h"

server/gameserver/skillhelper.cc

@@ -10,7 +10,7 @@
 #include "room.h"
 #include "roomobstacle.h"
 #include "ability.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 
 #include "mt/Buff.h"
 #include "mt/Skill.h"

server/gameserver/stats.cc

@@ -3,7 +3,7 @@
 #include "stats.h"
 #include "human.h"
 #include "room.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 
 static double TopXFunc (Human* sender,
                         std::function<int (Human*, Human*)> cmpFunc,

server/gameserver/team.cc

@@ -7,7 +7,7 @@
 #include "room.h"
 #include "app.h"
 #include "bornpoint.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 #include "stats.h"
 #include "jsondatamgr.h"
 #include "httpproxy.h"

server/gameserver/weapon.cc

@@ -2,7 +2,7 @@
 
 #include "weapon.h"
 #include "creature.h"
-#include "battledatacontext.h"
+#include "netdata.h"
 #include "pbutils.h"
 #include "human.h"