summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/skill.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e1b5c969b..237805ca3 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2010/12/26
+ * Fixed skill_can_produce_mix not checking, whether or not the produced goods can actually be stored (bugreport:4674). [Ai4rei]
* Reverted r14565, as the database version is already properly commented in source and is overwritten upon first sync of account.txt anyway. [Ai4rei]
* Cleaned up script command checkweight. [Ai4rei]
- Replaced some code parts with calls to pc_checkadditem and pc_inventoryblank (follow up to r13735).
diff --git a/src/map/skill.c b/src/map/skill.c
index 3c4cbcd21..6b63c2b83 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -10750,6 +10750,11 @@ int skill_can_produce_mix (struct map_session_data *sd, int nameid, int trigger,
if( i >= MAX_SKILL_PRODUCE_DB )
return 0;
+ if( pc_checkadditem(sd, nameid, qty) == ADDITEM_OVERAMOUNT )
+ {// cannot carry the produced stuff
+ return 0;
+ }
+
if(trigger>=0){
if(trigger>20) { // Non-weapon, non-food item (itemlv must match)
if(skill_produce_db[i].itemlv!=trigger)