diff --git a/server/gameserver/ingamevoice.cc b/server/gameserver/ingamevoice.cc index e0594515..3ff9db66 100644 --- a/server/gameserver/ingamevoice.cc +++ b/server/gameserver/ingamevoice.cc @@ -314,6 +314,9 @@ void InGameVoice::TriggerEvent(Human* killer, Human* deader) if (sent) { return; } + if (is_first_boold) { + return; + } { if (!is_first_boold) { int val = GetIntMap(personal_nodead_series_kills_, killer->GetUniId()); @@ -335,7 +338,7 @@ void InGameVoice::TriggerEvent(Human* killer, Human* deader) return; } { - if (!is_first_boold) { + { int val = GetIntMap(personal_series_kills_, killer->GetUniId()); mt::InGameVoice::Traverse ( @@ -351,7 +354,7 @@ void InGameVoice::TriggerEvent(Human* killer, Human* deader) } } { - if (!is_first_boold) { + { int val = GetIntMap(personal_kills_, killer->GetUniId()); mt::InGameVoice::Traverse ( @@ -367,39 +370,21 @@ void InGameVoice::TriggerEvent(Human* killer, Human* deader) } } { - if (!is_first_boold) { + if (deader->GetTeam()->AllIsDead()) { mt::InGameVoice::Traverse ( room_->IsMobaModeRoom(), - InGameVoiceEventType_e::kMyTeamateBeKill, - [this, killer, deader] (const mt::InGameVoice* meta) -> bool - { - Notify(killer, deader, meta); - return true; - }); - } - } - { - if (!is_first_boold) { - if (deader->GetTeam()->AllIsDead()) { - mt::InGameVoice::Traverse - ( - room_->IsMobaModeRoom(), - InGameVoiceEventType_e::kMyTeamAllDead, - [this, killer, deader] (const mt::InGameVoice* meta) -> bool - { - Notify(killer, deader, meta); - return true; - }); - } - } - } - { - if (!is_first_boold) { - mt::InGameVoice::Traverse - ( - room_->IsMobaModeRoom(), - InGameVoiceEventType_e::kEnemyTeamBekill, + InGameVoiceEventType_e::kTeamAllDead, + [this, killer, deader] (const mt::InGameVoice* meta) -> bool + { + Notify(killer, deader, meta); + return true; + }); + } else { + mt::InGameVoice::Traverse + ( + room_->IsMobaModeRoom(), + InGameVoiceEventType_e::kHeroBeKill, [this, killer, deader] (const mt::InGameVoice* meta) -> bool { Notify(killer, deader, meta); @@ -407,4 +392,5 @@ void InGameVoice::TriggerEvent(Human* killer, Human* deader) }); } } + } diff --git a/server/gameserver/mt/InGameVoice.h b/server/gameserver/mt/InGameVoice.h index c9d4d559..90c38c76 100644 --- a/server/gameserver/mt/InGameVoice.h +++ b/server/gameserver/mt/InGameVoice.h @@ -6,9 +6,8 @@ A8_DECLARE_ENUM(InGameVoiceEventType_e, kGlobalKills = 1, kPersonalExceptFirstBooldKills = 2, - kMyTeamateBeKill = 3, - kEnemyTeamBekill = 4, - kMyTeamAllDead = 5, + kHeroBeKill = 3, + kTeamAllDead = 5, kSeriesKills = 11, kNoDeadSeriesKills = 21, kFail = 99,