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 2024-10-11 14:15:50 +08:00
parent a8e2bd0d47
commit 2ea0a2657d
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/gameserver/player.cc
View File

@ -35,6 +35,7 @@
#include "mapinstance.h" #include "mapinstance.h"
#include "debugcmd.h" #include "debugcmd.h"
#include "netdata.h" #include "netdata.h"
#include "bag.h"
#include "mt/Param.h" #include "mt/Param.h"
#include "mt/Equip.h" #include "mt/Equip.h"
@ -276,6 +277,9 @@ void Player::InternalUpdate(int delta_time)
if (use_item) { if (use_item) {
UpdateUseItemIdx(); UpdateUseItemIdx();
} }
if (has_use_bag_item_id) {
UpdateBagUseItemId();
}
if (action_type != AT_None) { if (action_type != AT_None) {
UpdateAction(); UpdateAction();
} }
@ -601,6 +605,13 @@ void Player::UpdateUseItemId()
MarkSyncActivePlayer(__FILE__, __LINE__, __func__); MarkSyncActivePlayer(__FILE__, __LINE__, __func__);
} }
void Player::UpdateBagUseItemId()
{
GetBag()->UseItem(use_bag_item_id);
use_bag_item_id = 0;
has_use_bag_item_id = false;
}
void Player::UpdateSpectate() void Player::UpdateSpectate()
{ {
if (room->GetGasData().GetGasMode() == GasInactive || if (room->GetGasData().GetGasMode() == GasInactive ||
@ -1239,9 +1250,13 @@ void Player::_CMMove(f8::MsgHdr* hdr, const cs::CMMove& msg)
use_item = true; use_item = true;
use_item_idx = msg.use_item_idx(); use_item_idx = msg.use_item_idx();
} }
if (msg.has_use_item_id()) { if (msg.has_use_item_idx()) {
has_use_item_id = true; use_item = true;
use_item_id = msg.use_item_id(); use_item_idx = msg.use_item_idx();
}
if (msg.has_use_bag_item_id()) {
has_use_bag_item_id = true;
use_bag_item_id = msg.use_bag_item_id();
} }
if (msg.has_spectate()) { if (msg.has_spectate()) {
spectate = true; spectate = true;

3
server/gameserver/player.h
View File

@ -62,7 +62,7 @@ class Player : public Human
bool use_item = false; bool use_item = false;
int use_item_idx = 0; int use_item_idx = 0;
bool use_bag_item = false; bool has_use_bag_item_id = false;
int use_bag_item_id = 0; int use_bag_item_id = 0;
bool has_use_item_id = false; bool has_use_item_id = false;
@ -113,6 +113,7 @@ class Player : public Human
void UpdateCancelAction(); void UpdateCancelAction();
void UpdateUseItemIdx(); void UpdateUseItemIdx();
void UpdateUseItemId(); void UpdateUseItemId();
void UpdateBagUseItemId();
void UpdateSpectate(); void UpdateSpectate();
void UpdateEmote(); void UpdateEmote();
void UpdateJump(); void UpdateJump();