server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2022-12-25 11:32:30 +08:00
parent 49afb5deb0
commit 9d0d0c0033
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/gameserver/player.cc
View File

@ -158,12 +158,9 @@ void Player::InternalUpdate(int delta_time)
if (drop_weapon) { if (drop_weapon) {
UpdateDropWeapon(); UpdateDropWeapon();
} }
// 222 if (!interaction_objids.empty()) {
#if 0
if (interaction_objids.size() > 0) {
ProcInteraction(); ProcInteraction();
} }
#endif
if (poisoning) { if (poisoning) {
UpdatePoisoning(); UpdatePoisoning();
} }
@ -604,8 +601,6 @@ void Player::ProcInteraction()
return; return;
} }
cs::SMGetItemNotify notify_msg; cs::SMGetItemNotify notify_msg;
// 222
#if 0
for (auto obj_id : interaction_objids) { for (auto obj_id : interaction_objids) {
Entity* entity = room->GetEntityByUniId(obj_id); Entity* entity = room->GetEntityByUniId(obj_id);
#ifdef DEBUG #ifdef DEBUG
@ -667,11 +662,10 @@ void Player::ProcInteraction()
#endif #endif
} }
} }
interaction_objids.Clear(); interaction_objids.clear();
if (notify_msg.items().size() > 0) { if (notify_msg.items().size() > 0) {
SendNotifyMsg(notify_msg); SendNotifyMsg(notify_msg);
} }
#endif
} }
void Player::ObstacleInteraction(Obstacle* entity) void Player::ObstacleInteraction(Obstacle* entity)
@ -882,12 +876,11 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
if (!shot_hold) { if (!shot_hold) {
series_shot_frames = 0; series_shot_frames = 0;
} }
// 222
#if 0
if (msg.has_interaction()) { if (msg.has_interaction()) {
interaction_objids = msg.interaction_objids(); for (auto objid : msg.interaction_objids()) {
interaction_objids.push_back(objid);
}
} }
#endif
last_seq_id = msg.seq(); last_seq_id = msg.seq();
if (msg.has_select_weapon()) { if (msg.has_select_weapon()) {
select_weapon = true; select_weapon = true;

5
server/gameserver/player.h
View File

@ -86,10 +86,7 @@ class Player : public Human
std::shared_ptr<cs::MFSettlement> settlement; std::shared_ptr<cs::MFSettlement> settlement;
// 222 std::vector<int> interaction_objids;
#if 0
::google::protobuf::RepeatedField< ::google::protobuf::int32 > interaction_objids;
#endif
virtual ~Player() override; virtual ~Player() override;
virtual void Initialize() override; virtual void Initialize() override;