diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-10 00:20:36 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-10 00:20:36 +0000 |
| commit | b7d0f3d4c08f57f2dbfad5721c7f2253f89681cd (patch) | |
| tree | 185cd91cceecea91414448e152477280198f08c5 | |
| parent | 2e6b60b75297768f421f26a251491ab0e80dc30c (diff) | |
| download | hercules-b7d0f3d4c08f57f2dbfad5721c7f2253f89681cd.tar.gz hercules-b7d0f3d4c08f57f2dbfad5721c7f2253f89681cd.tar.bz2 hercules-b7d0f3d4c08f57f2dbfad5721c7f2253f89681cd.tar.xz hercules-b7d0f3d4c08f57f2dbfad5721c7f2253f89681cd.zip | |
- Fixed the linked bard/dancer skills toggling with each call to pc_calc_status
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5545 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 4856fe0e0..33e40266d 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/09
+ * Fixed the dancer/bard soul-linked skills toggling on/off with each call
+ to pc_calc_status. [Skotlex]
* Fixed a bug in the pc_skillreset function which allowed TK rankers to
accumulate skill points. [Skotlex]
* Fixed a major memory leak in status.c causing the last column of job_db1.txt
diff --git a/src/map/pc.c b/src/map/pc.c index 86c298376..753fa8455 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -999,7 +999,6 @@ int pc_calc_skilltree(struct map_session_data *sd) sd->status.skill[i].lv=(sd->status.skill[i].flag==1)?0:sd->status.skill[i].flag-2;
sd->status.skill[i].flag=0;
}
- else
if(sd->sc.count && sd->sc.data[SC_SPIRIT].timer != -1 && sd->sc.data[SC_SPIRIT].val2 == SL_BARDDANCER && i >= DC_HUMMING && i<= DC_SERVICEFORYOU)
{ //Enable Bard/Dancer spirit linked skills.
if (sd->status.sex) { //Link dancer skills to bard.
@@ -6946,15 +6945,6 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos) }
status_calc_pc(sd,0);
- if(sd->special_state.infinite_endure) {
- if(sd->sc.data[SC_ENDURE].timer == -1)
- status_change_start(&sd->bl,SC_ENDURE,100,10,1,0,0,0,0);
- }
- else {
- if(sd->sc.count && sd->sc.data[SC_ENDURE].timer != -1 && sd->sc.data[SC_ENDURE].val2)
- status_change_end(&sd->bl,SC_ENDURE,-1);
- }
-
if(sd->sc.count) {
if (sd->sc.data[SC_SIGNUMCRUCIS].timer != -1 && !battle_check_undead(7,sd->def_ele))
status_change_end(&sd->bl,SC_SIGNUMCRUCIS,-1);
|