diff --git a/server/gameserver/killmgr.cc b/server/gameserver/killmgr.cc index 490819b5..cbc195c4 100644 --- a/server/gameserver/killmgr.cc +++ b/server/gameserver/killmgr.cc @@ -8,48 +8,37 @@ #include "cs_proto.pb.h" -struct RollMsgHintInfo +bool RollMsgHintInfo::Replace(int idx, std::string& text) { - std::string master_name; - std::string killer_name; - std::string dead_name; - std::string weapon_text_icon; - - std::vector>* hint_template = nullptr; - - bool Replace(int idx, std::string& text) - { - switch (idx) { - case kFieldIdxMasterName: - { - text = master_name; - } - break; - case kFieldIdxKillerName: - { - text = killer_name; - } - break; - case kFieldIdxDeadName: - { - text = dead_name; - } - break; - case kFieldIdxWeaponTextIcon: - { - text = weapon_text_icon; - } - break; - default: - { - return false; - } - break; + switch (idx) { + case kFieldIdxMasterName: + { + text = master_name; } - return true; + break; + case kFieldIdxKillerName: + { + text = killer_name; + } + break; + case kFieldIdxDeadName: + { + text = dead_name; + } + break; + case kFieldIdxWeaponTextIcon: + { + text = weapon_text_icon; + } + break; + default: + { + return false; + } + break; } - -}; + return true; +} void KillMgr::Init() { diff --git a/server/gameserver/killmgr.h b/server/gameserver/killmgr.h index c81d55cb..727f07a7 100644 --- a/server/gameserver/killmgr.h +++ b/server/gameserver/killmgr.h @@ -17,8 +17,18 @@ struct KillInfo std::string real_killer_name; }; +struct RollMsgHintInfo +{ + std::string master_name; + std::string killer_name; + std::string dead_name; + std::string weapon_text_icon; + + std::vector>* hint_template = nullptr; + bool Replace(int idx, std::string& text); +}; + class Human; -struct RollMsgHintInfo; class KillMgr : public a8::Singleton {