summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-12-03 11:36:10 -0200
committershennetsind <ind@henn.et>2013-12-03 11:36:10 -0200
commit85023b1aad64d2b3b5d5ff53e1704abe0e689aa9 (patch)
tree97d1ead260038711e8693f1ffa4cf4d09128f533
parentff5779033a7d45bbd306b2bf62759152a72cbe79 (diff)
downloadhercules-85023b1aad64d2b3b5d5ff53e1704abe0e689aa9.tar.gz
hercules-85023b1aad64d2b3b5d5ff53e1704abe0e689aa9.tar.bz2
hercules-85023b1aad64d2b3b5d5ff53e1704abe0e689aa9.tar.xz
hercules-85023b1aad64d2b3b5d5ff53e1704abe0e689aa9.zip
Fixed Bug 7542
replaced pc_isuseitem 90overweight error message by its official version, added invent-full check for when trying to open packages/boxes, and modified mail getAttachment to fail when over 90% weight. Special Thanks to kyeme. http://hercules.ws/board/tracker/issue-7542-bug-when-weight-90/ Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--conf/messages.conf2
-rw-r--r--src/map/clif.c5
-rw-r--r--src/map/clif.h1
-rw-r--r--src/map/pc.c13
4 files changed, 16 insertions, 5 deletions
diff --git a/conf/messages.conf b/conf/messages.conf
index ba63dc73a..f9dc5edd4 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -1524,7 +1524,7 @@
1476: You are already mounting something else
//src/map/pc.c::pc_isUseitem
-1477: Item cannot be open when overweight by 90%
+1477: Item cannot be open when inventory is full
//@homlv
1478: Homun reached its maximum level of '%d'
diff --git a/src/map/clif.c b/src/map/clif.c
index 2257df0aa..312393629 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -14843,6 +14843,11 @@ void clif_parse_Mail_getattach(int fd, struct map_session_data *sd)
if ((data = itemdb->exists(sd->mail.inbox.msg[i].item.nameid)) == NULL)
return;
+ if( pc_is90overweight(sd) ) {
+ clif->mail_getattachment(fd, 2);
+ return;
+ }
+
switch( pc->checkadditem(sd, data->nameid, sd->mail.inbox.msg[i].item.amount) ) {
case ADDITEM_NEW:
fail = ( pc->inventoryblank(sd) == 0 );
diff --git a/src/map/clif.h b/src/map/clif.h
index 8b78f27e9..ce60dfb6b 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -342,6 +342,7 @@ typedef enum useskill_fail_cause { // clif_skill_fail
}useskill_fail_cause;
enum clif_messages {
+ ITEM_CANT_OBTAIN_WEIGHT = 0x34, /* you cannot carry more items because you are overweight. */
SKILL_CANT_USE_AREA = 0x536,
ITEM_CANT_USE_AREA = 0x537,
};
diff --git a/src/map/pc.c b/src/map/pc.c
index 64fbd77f3..85285e55c 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4305,10 +4305,15 @@ int pc_isUseitem(struct map_session_data *sd,int n)
else if( itemdb_is_poison(nameid) && (sd->class_&MAPID_THIRDMASK) != MAPID_GUILLOTINE_CROSS )
return 0;
- if( (item->package || item->group) && pc_is90overweight(sd) ) {
- //##TODO## find official response to this
- clif->colormes(sd->fd,COLOR_RED,msg_txt(1477));// Item cannot be open when overweight by 90%
- return 0;
+ if( item->package || item->group ) {
+ if( pc_is90overweight(sd) ) {
+ clif->msgtable(sd->fd,ITEM_CANT_OBTAIN_WEIGHT);
+ return 0;
+ }
+ if( !pc->inventoryblank(sd) ) {
+ clif->colormes(sd->fd,COLOR_RED,msg_txt(1477));
+ return 0;
+ }
}
//Gender check