summaryrefslogtreecommitdiff
path: root/src/map/storage.cpp
diff options
context:
space:
mode:
authorHoraK-FDF <horak-fdf@web.de>2024-06-06 19:36:23 +0000
committerLed Mitz <smoothshifter@tuta.io>2024-06-06 19:36:23 +0000
commit04c17a55c5b83e1b8ef1dc336fd8e023ba1e10ad (patch)
tree684a3f499b16bc44940eff429314ec54077f75ff /src/map/storage.cpp
parent1841311e6302ff88e53446744e571bed703d2087 (diff)
downloadtmwa-04c17a55c5b83e1b8ef1dc336fd8e023ba1e10ad.tar.gz
tmwa-04c17a55c5b83e1b8ef1dc336fd8e023ba1e10ad.tar.bz2
tmwa-04c17a55c5b83e1b8ef1dc336fd8e023ba1e10ad.tar.xz
tmwa-04c17a55c5b83e1b8ef1dc336fd8e023ba1e10ad.zip
KeepAfterUse + DontUseAmmo
**** Approved-by: Free Yorp <thefreeyorp+git@gmail.com> Approved-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl> Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Diffstat (limited to 'src/map/storage.cpp')
-rw-r--r--src/map/storage.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/map/storage.cpp b/src/map/storage.cpp
index 54398f3..cab3f0f 100644
--- a/src/map/storage.cpp
+++ b/src/map/storage.cpp
@@ -186,11 +186,15 @@ int storage_storageadd(dumb_ptr<map_session_data> sd, IOff0 index, int amount)
if (amount < 1 || amount > sd->status.inventory[index].amount)
return 0;
- if (bool(itemdb_search(sd->status.inventory[index].nameid)->mode & ItemMode::NO_STORAGE))
+ OMATCH_BEGIN_SOME (sdidn, sd->inventory_data[index])
{
- clif_displaymessage(sd->sess, "This item can't be stored."_s);
- return 0;
+ if (bool(sdidn->mode & ItemMode::NO_STORAGE))
+ {
+ clif_displaymessage(sd->sess, "This item can't be stored."_s);
+ return 0;
+ }
}
+ OMATCH_END ();
// log_tostorage(sd, index, 0);
if (storage_additem(sd, stor, &sd->status.inventory[index], amount) == 0)