From b2edb40d2cef21c36ff9b062ef23a9c4aa4a53df Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 26 Dec 2022 09:48:28 +0800 Subject: [PATCH] 1 --- server/gameserver/mt/KillPoint.cc | 18 ++++++++++-------- server/gameserver/mt/KillPoint.h | 4 ++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/server/gameserver/mt/KillPoint.cc b/server/gameserver/mt/KillPoint.cc index b1546f00..817518dc 100644 --- a/server/gameserver/mt/KillPoint.cc +++ b/server/gameserver/mt/KillPoint.cc @@ -3,24 +3,26 @@ #include "mt/KillPoint.h" IMPL_TABLE(mt::KillPoint) +std::map mt::KillPoint::kill_hash_; namespace mt { + void KillPoint::Init1() + { + kill_hash_[kill_num()] = this; + } + int KillPoint::GetKillPointParam1(int kill_num) { -#if 0 - auto itr = loader_->killpoint_hash.find(kill_num); - return itr != loader_->killpoint_hash.end() ? itr->second->pb->parameter() : 0; -#endif + auto itr = kill_hash_.find(kill_num); + return itr != kill_hash_.end() ? itr->second->parameter() : 0; } int KillPoint::GetKillPointParam2(int kill_num) { -#if 0 - auto itr = loader_->killpoint_hash.find(kill_num); - return itr != loader_->killpoint_hash.end() ? itr->second->pb->parameter2() : 0; -#endif + auto itr = kill_hash_.find(kill_num); + return itr != kill_hash_.end() ? itr->second->parameter2() : 0; } } diff --git a/server/gameserver/mt/KillPoint.h b/server/gameserver/mt/KillPoint.h index 3f516dd1..69c49dd8 100644 --- a/server/gameserver/mt/KillPoint.h +++ b/server/gameserver/mt/KillPoint.h @@ -11,9 +11,13 @@ namespace mt "kill_num") public: + void Init1(); static int GetKillPointParam1(int kill_num); static int GetKillPointParam2(int kill_num); + private: + + static std::map kill_hash_; }; }