1
This commit is contained in:
parent
e2a730e49b
commit
adcfb27b2b
@ -805,6 +805,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i
|
||||
downed = false;
|
||||
downed_timer = nullptr;
|
||||
BeKill(killer_id, killer_name, weapon_id);
|
||||
SyncAroundPlayers(__FILE__, __LINE__, __func__);
|
||||
} else {
|
||||
if (HasNoDownedTeammate()) {
|
||||
health = MetaMgr::Instance()->GetSysParamAsInt("downed_recover_hp");
|
||||
@ -819,17 +820,14 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i
|
||||
downed_func,
|
||||
&xtimer_attacher.timer_list_
|
||||
);
|
||||
SyncAroundPlayers(__FILE__, __LINE__, __func__);
|
||||
} else {
|
||||
BeKill(killer_id, killer_name, weapon_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#if 1
|
||||
room->frame_event.AddHpChg(this);
|
||||
#else
|
||||
SyncAroundPlayers(__FILE__, __LINE__, __func__);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
void Human::AddToNewObjects(Entity* entity)
|
||||
|
Loading…
x
Reference in New Issue
Block a user