From 224cd939c532a889311d696e36a7497b293b2040 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 29 Mar 2024 19:53:12 +0800 Subject: [PATCH] 1 --- server/gameserver/ingamevoice.cc | 7 ++++--- server/gameserver/ingamevoice.h | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/server/gameserver/ingamevoice.cc b/server/gameserver/ingamevoice.cc index 912d4c5b..598bf176 100644 --- a/server/gameserver/ingamevoice.cc +++ b/server/gameserver/ingamevoice.cc @@ -49,11 +49,10 @@ void InGameVoice::OnHumanBeKill(int killer_id, Human* deader) personal_nodead_series_kills_.erase(deader->GetUniId()); ++global_kills_; IncIntMap(personal_kills_, killer_id); - IncIntMap(personal_nodead_series_kills_, killer_id); + IncIntMap(personal_series_kills_, killer_id); //UpdateTeamBeKillLastTime(GetTeamBeKillLastTime(deader->GetTeam()->GetTeamId())); - IncPersonalSeriesKills(killer_id); if (!killer->dead) { - IncPersonalNoDeadSeriesKills(killer_id); + IncIntMap(personal_nodead_series_kills_, killer_id); } { mt::InGameVoice::Traverse @@ -75,6 +74,7 @@ void InGameVoice::UpdateTeamBeKillLastTime(int team_id) team_bekill_last_time_hash_[team_id] = room_->GetFrameNo(); } +#if 0 void InGameVoice::IncPersonalSeriesKills(int killer_id) { auto itr = personal_series_kills_.find(killer_id); @@ -114,6 +114,7 @@ void InGameVoice::IncPersonalNoDeadSeriesKills(int killer_id) }, &room_->xtimer_attacher_); } +#endif void InGameVoice::Notify(Human* killer, Human* deader, const mt::InGameVoice* meta) { diff --git a/server/gameserver/ingamevoice.h b/server/gameserver/ingamevoice.h index 97cab628..827b4883 100644 --- a/server/gameserver/ingamevoice.h +++ b/server/gameserver/ingamevoice.h @@ -15,17 +15,15 @@ class InGameVoice : public std::enable_shared_from_this private: void UpdateTeamBeKillLastTime(int team_id); - void IncPersonalSeriesKills(int killer_id); - void IncPersonalNoDeadSeriesKills(int killer_id); void Notify(Human* killer, Human* deader, const mt::InGameVoice* meta); private: + Room* room_ = nullptr; int global_kills_ = 0; std::map personal_kills_; std::map personal_series_kills_; std::map personal_nodead_series_kills_; std::map team_bekill_last_time_hash_; - };