MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check the item at the target position before searching all items

Browse source
This commit is contained in:
ephphatha 2021-11-14 17:55:41 +11:00 • committed by Anders Jenbo
commit 87651aa2f5
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/items.h
View file

@ -367,6 +367,11 @@ struct Item {
return IsScroll() && _iSpell == spellId;
}
[[nodiscard]] bool KeyAttributesMatch(int32_t seed, _item_indexes itemIndex, uint16_t createInfo)
{
return _iSeed == seed && IDidx == itemIndex && _iCreateInfo == createInfo;
}
UiFlags getTextColor() const
{
switch (_iMagical) {

13
Source/msg.cpp
View file

@ -707,7 +707,18 @@ DWORD OnRequestGetItem(const TCmd *pCmd, Player &player)
if (gbBufferMsgs != 1 && IOwnLevel(player.plrlevel) && IsGItemValid(message)) {
const Point position { message.x, message.y };
if (GetItemRecord(message.dwSeed, message.wCI, message.wIndx)) {
int ii = FindGetItem(message.wIndx, message.wCI, message.dwSeed);
int ii = -1;
if (InDungeonBounds(position)) {
ii = abs(dItem[position.x][position.y]) - 1;
if (ii >= 0 && !Items[ii].KeyAttributesMatch(message.dwSeed, static_cast<_item_indexes>(message.wIndx), message.wCI)) {
ii = -1;
}
}
if (ii == -1) { // No item at the target position or the key attributes don't match, so try find a matching item.
ii = FindGetItem(message.wIndx, message.wCI, message.dwSeed);
}
if (ii != -1) {
NetSendCmdGItem2(false, CMD_GETITEM, MyPlayerId, message.bPnum, message);
if (message.bPnum != MyPlayerId)