From f209166ccad43550406e9c43d2e359376c1f8d05 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 14 Sep 2020 16:33:45 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index d7c1e34..6e74aad 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -738,7 +738,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) Entity* hum = room->GetEntityByUniId(killer_id); if (hum && hum->entity_type == ET_Player) { if (killer_id == entity_uniid) { - std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_specate"), //"%s 自杀" + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_specate").c_str(), //"%s 自杀" { killer_name, }); @@ -748,7 +748,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) ((Human*)hum)->kill_humans.insert(this); ((Human*)hum)->SyncAroundPlayers(__FILE__, __LINE__, __func__); if (weapon_id == VW_Tank) { - std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_car"), //"%s 使用 %s 干掉了 %s" + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_car").c_str(), //"%s 使用 %s 干掉了 %s" { killer_name, name @@ -758,7 +758,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) MetaData::Equip* equip_meta = MetaMgr::Instance()->GetEquip(weapon_id); if (equip_meta) { //"%s 使用 %s 干掉了 %s" - std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_weapon"), + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_weapon").c_str(), { killer_name, equip_meta->i->name(), @@ -773,7 +773,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) case VW_SafeArea: { //"%s 被毒圈干掉" - std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_gas"), + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_gas").c_str(), { name }); @@ -783,7 +783,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) case VW_Spectate: { //"%s 自杀" - std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_specate"), + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_specate").c_str(), { name }); @@ -793,7 +793,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) case VW_SelfDetonate: { //"%s 被炸死" - std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_self_detonate"), + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_self_detonate").c_str(), { name }); @@ -803,7 +803,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) case VW_Mine: { //"%s 被地雷炸死" - std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_mine"), + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_mine").c_str(), { name });