Procházet zdrojové kódy

* Fixed skill_can_produce_mix not checking, whether or not the produced goods can actually be stored (bugreport:4674).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14633 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei před 14 roky
rodič
revize
3ca9ea993f
2 změnil soubory, kde provedl 6 přidání a 0 odebrání
  1. 1 0
      Changelog-Trunk.txt
  2. 5 0
      src/map/skill.c

+ 1 - 0
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).

+ 5 - 0
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)