summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-27 11:30:00 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-27 11:30:00 +0000
commitd10cf69aff5fdc4894535e62705de9f6bdfe2672 (patch)
tree51141c8bfe2160f319b51ae5b7ae15af5b255ca3 /src
parent6096ce0b42a3eee07dc70ae5ef489aa4c30bf515 (diff)
downloadhercules-d10cf69aff5fdc4894535e62705de9f6bdfe2672.tar.gz
hercules-d10cf69aff5fdc4894535e62705de9f6bdfe2672.tar.bz2
hercules-d10cf69aff5fdc4894535e62705de9f6bdfe2672.tar.xz
hercules-d10cf69aff5fdc4894535e62705de9f6bdfe2672.zip
* Merged fixes from trunk for script command 'checkweight' (r14631) and skill-based item production (r14633).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14634 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/script.c3
-rw-r--r--src/map/skill.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 773f8d6c4..59a9b5448 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -5411,6 +5411,7 @@ BUILDIN_FUNC(checkweight)
if( id == NULL )
{
ShowError("buildin_checkweight: Invalid item '%s'.\n", script_getstr(st,2)); // returns string, regardless of what it was
+ script_pushint(st,0);
return 1;
}
@@ -5420,6 +5421,7 @@ BUILDIN_FUNC(checkweight)
if( amount < 1 )
{
ShowError("buildin_checkweight: Invalid amount '%d'.\n", amount);
+ script_pushint(st,0);
return 1;
}
@@ -5461,6 +5463,7 @@ BUILDIN_FUNC(checkweight)
return 0;
}
+ script_pushint(st,1);
return 0;
}
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)