From 6a3008f5342072ff38ddc9e58c882deebef13303 Mon Sep 17 00:00:00 2001 From: Xantara Date: Thu, 12 Dec 2013 00:45:52 -0700 Subject: Fix core bug issue 7435: When the Storage is open --- conf/messages.conf | 1 + src/map/pc.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/conf/messages.conf b/conf/messages.conf index f9dc5edd4..8b3daa684 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -1520,6 +1520,7 @@ //src/map/pc.c::pc_isUseitem 1474: You cannot use this item while sitting +1475: You cannot use this item while storage is open 1476: You are already mounting something else diff --git a/src/map/pc.c b/src/map/pc.c index ab5749eb1..43bdb5f82 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4216,6 +4216,11 @@ int pc_isUseitem(struct map_session_data *sd,int n) return 0; // You cannot use this item while sitting. } + if (sd->state.storage_flag && item->type != IT_CASH) { + clif->colormes(sd->fd, COLOR_RED, msg_txt(1475)); + return 0; // You cannot use this item while storage is open. + } + switch( nameid ) { // TODO: Is there no better way to handle this, other than hardcoding item IDs? case ITEMID_ANODYNE: if( map_flag_gvg2(sd->bl.m) ) -- cgit v1.2.3-70-g09d2