summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-03 14:56:07 +0000
committerDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-03 14:56:07 +0000
commit00fcc3fb3eb3fbe68ce72ba25b034a74f469290a (patch)
treecb6b17da5463c0de01f5e3f0e665d9dfe4f911f0
parentcb1d2d92afbf8d9ebec4c9290a180835ad5dae78 (diff)
downloadhercules-00fcc3fb3eb3fbe68ce72ba25b034a74f469290a.tar.gz
hercules-00fcc3fb3eb3fbe68ce72ba25b034a74f469290a.tar.bz2
hercules-00fcc3fb3eb3fbe68ce72ba25b034a74f469290a.tar.xz
hercules-00fcc3fb3eb3fbe68ce72ba25b034a74f469290a.zip
Cooking fix
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8097 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/skill.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index cc3312c81..79a910f40 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,7 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/03
+ * Fixed a logic error preventing from cooking anything [DracoRPG]
* Cleaned up the last NJ update code. [Skotlex]
* Added @ command `charspeed` [Skotlex]
* Fixed @jailfor using MAP_PRONTERA as jail instead of MAP_JAIL [Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c
index f9b229377..ec1c43983 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -10221,7 +10221,7 @@ int skill_can_produce_mix (struct map_session_data *sd, int nameid, int trigger,
if(skill_produce_db[i].itemlv!=trigger)
return 0;
} else if(trigger>10) { // Food (any item level between 10 and 20 will do)
- if(skill_produce_db[i].itemlv>10 && skill_produce_db[i].itemlv<=20)
+ if(skill_produce_db[i].itemlv<=10 || skill_produce_db[i].itemlv>20)
return 0;
} else { // Weapon (itemlv must be higher or equal)
if(skill_produce_db[i].itemlv>trigger)