From 338b731a319d3a4a07b9a5ac101a07a3d389ae04 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 1 Apr 2024 14:42:37 +0800 Subject: [PATCH] 1 --- server/gameserver/ingamevoice.cc | 6 +++--- server/gameserver/ingamevoice.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/gameserver/ingamevoice.cc b/server/gameserver/ingamevoice.cc index 2e372229..2eff0d96 100644 --- a/server/gameserver/ingamevoice.cc +++ b/server/gameserver/ingamevoice.cc @@ -285,11 +285,11 @@ a8::Attacher* InGameVoice::GetNoDeadTimerAttacher(int killer_id) { auto itr = personal_nodead_timer_attacher_.find(killer_id); if (itr == personal_nodead_timer_attacher_.end()) { - personal_nodead_timer_attacher_[killer_id] = a8::Attacher(); + personal_nodead_timer_attacher_[killer_id] = std::make_shared(); itr = personal_nodead_timer_attacher_.find(killer_id); - itr->second.SetOwner(&room_->xtimer); + itr->second->SetOwner(&room_->xtimer); } - return &itr->second; + return itr->second.get(); } void InGameVoice::TriggerEvent(Human* killer, Human* deader) diff --git a/server/gameserver/ingamevoice.h b/server/gameserver/ingamevoice.h index 3d3b48a5..26f255b1 100644 --- a/server/gameserver/ingamevoice.h +++ b/server/gameserver/ingamevoice.h @@ -29,6 +29,6 @@ private: std::map personal_kills_; std::map personal_series_kills_; std::map personal_nodead_series_kills_; - std::map personal_nodead_timer_attacher_; + std::map> personal_nodead_timer_attacher_; };