修复自杀统计问题

This commit is contained in:
aozhiwei 2019-05-23 09:47:28 +08:00
parent e369305fbe
commit 1163463151

View File

@ -508,17 +508,25 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
if (!dead && !room->game_over) { if (!dead && !room->game_over) {
Entity* hum = room->GetEntityByUniId(killer_id); Entity* hum = room->GetEntityByUniId(killer_id);
if (hum && hum->entity_type == ET_Player) { if (hum && hum->entity_type == ET_Player) {
((Human*)hum)->stats.kills++; if (killer_id == entity_uniid) {
((Human*)hum)->kill_humans.insert(this); std::string msg = a8::Format("%s 自杀",
MetaData::Equip* equip_meta = MetaMgr::Instance()->GetEquip(weapon_id);
if (equip_meta) {
std::string msg = a8::Format("%s 使用 %s 干掉了 %s",
{ {
killer_name, killer_name,
equip_meta->i->name(),
name
}); });
SendRollMsg(msg); SendRollMsg(msg);
} else {
((Human*)hum)->stats.kills++;
((Human*)hum)->kill_humans.insert(this);
MetaData::Equip* equip_meta = MetaMgr::Instance()->GetEquip(weapon_id);
if (equip_meta) {
std::string msg = a8::Format("%s 使用 %s 干掉了 %s",
{
killer_name,
equip_meta->i->name(),
name
});
SendRollMsg(msg);
}
} }
} else { } else {
switch (weapon_id) { switch (weapon_id) {