summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-01-16 03:44:07 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-01-16 03:44:07 +0000
commit0529fa63b009df33b06057a7f23670f873cefed9 (patch)
tree221d9096c49340636f82949ef77595dc73214c6b
parent55c32e60060d55f9c720109ec350942a5a2e0c9d (diff)
downloadhercules-0529fa63b009df33b06057a7f23670f873cefed9.tar.gz
hercules-0529fa63b009df33b06057a7f23670f873cefed9.tar.bz2
hercules-0529fa63b009df33b06057a7f23670f873cefed9.tar.xz
hercules-0529fa63b009df33b06057a7f23670f873cefed9.zip
Fixed items don't grant skill if you had this skill before and then changed your job.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14219 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/pc.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index cbc877c13..f5d101a50 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ 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.
+2010/01/16
+ * Fixed items don't grant skill if you had this skill before and then changed your job. [Inkfish]
2010/01/14
* Fixed change cart packet doesn't check for skill. [Inkfish]
* Added new packets for Plagiarism. [Inkfish]
diff --git a/src/map/pc.c b/src/map/pc.c
index c853bd452..56b3fd990 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2981,9 +2981,9 @@ int pc_skill(TBL_PC* sd, int id, int level, int flag)
sd->status.skill[id].lv += level;
break;
case 1: //Item bonus skill.
- if( sd->status.skill[id].lv >= level )
- return 0;
if( sd->status.skill[id].id == id ){
+ if( sd->status.skill[id].lv >= level )
+ return 0;
if( !sd->status.skill[id].flag ) //Non-granted skill, store it's level.
sd->status.skill[id].flag = sd->status.skill[id].lv + 2;
} else {