From 675d17f1bb2e22f13b1edf1b2d3d6c29256933a1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 29 May 2020 20:02:12 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 09e5774..d3d344d 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -316,7 +316,7 @@ Human* Room::FindEnemy(Human* hum) std::sort(enemys.begin(), enemys.end(), [hum] (Human* a, Human *b) -> bool { - return (hum->GetPos() - a->GetPos()).Norm() < (hum->GetPos() - b->GetPos()).Norm(); + return (hum->GetPos()-a->GetPos()).Norm() < (hum->GetPos()-b->GetPos()).Norm(); }); return !enemys.empty() ? enemys[0] : nullptr; } @@ -380,10 +380,6 @@ int Room::CreateLoot(int equip_id, a8::Vec2 pos, int count, int equip_lv) { MetaData::Equip* equip_meta = MetaMgr::Instance()->GetEquip(equip_id); if (equip_meta) { - if (equip_meta->i->equip_type() == 2 && - MetaMgr::Instance()->fighting_mode) { - return 0; - } Loot* entity = new Loot(); entity->room = this; entity->meta = equip_meta;