diff --git a/server/gameserver/entity.h b/server/gameserver/entity.h index 0950374..3dc3230 100644 --- a/server/gameserver/entity.h +++ b/server/gameserver/entity.h @@ -30,7 +30,6 @@ class Entity int grid_id = 0; std::set grid_list; - Entity* last_collision_door = nullptr; Entity(); virtual ~Entity(); diff --git a/server/gameserver/human.h b/server/gameserver/human.h index ddb6b92..2912dc3 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -77,6 +77,8 @@ class Human : public Entity bool need_sync_teammate_data = false; bool need_sync_active_player = false; + Entity* last_collision_door = nullptr; + PlayerStats stats; std::set* team_members = nullptr; diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 6d698bb..ac9c8ab 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -190,37 +190,14 @@ void Player::UpdateUseItemIdx() switch (use_item_idx) { case IS_HEALTHKIT: { - #if 0 - MetaData::Equip* item_meta = MetaMgr::Instance()->GetEquipBySlotId(use_item_idx); - if (item_meta) { - StartAction( - AT_UseItem, - item_meta->i->use_time(), - use_item_idx, - 0 - ); - } - #endif } break; case IS_PAIN_KILLER: { - #if 0 - MetaData::Equip* item_meta = MetaMgr::Instance()->GetEquipBySlotId(use_item_idx); - if (item_meta) { - StartAction( - AT_UseItem, - item_meta->i->use_time(), - use_item_idx, - 0 - ); - } - #endif } break; default: { - } break; }