server/game2004
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除obstacle无用代码

Browse Source
This commit is contained in:
aozhiwei 2020-05-22 17:07:25 +08:00
parent 1b7b57cbda
commit 3381f31ba0
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/gameserver/obstacle.cc
View File

@ -275,21 +275,13 @@ void Obstacle::Explosion(Bullet* bullet)
case ET_Player:
{
Human* hum = (Human*)target;
#if 1
if (!hum->dead) {
#else
if (!hum->dead && (hum->team_id == 0 || hum->team_id != player->team_id)) {
#endif
float dmg = meta->i->damage();
#if 1
float def = hum->ability.def;
#else
float def = hum->def + hum->buff.def_add;
#endif
float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K);
hum->DecHP(finaly_dmg, VP_Mine, "地雷", VW_Mine);
}
float dmg = meta->i->damage();
float def = hum->ability.def;
float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K);
hum->DecHP(finaly_dmg, VP_Mine, "地雷", VW_Mine);
}
}
break;
case ET_Obstacle:
{