diff options
| author | Freeyorp <Freeyorp101@hotmail.com> | 2009-12-30 14:23:19 +1300 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-01-02 08:28:58 +0000 |
| commit | 295cecfcc93d4d9cf9c8a8b28f44296be826a392 (patch) | |
| tree | 689ab4b305cac99bf58476c08589bb82bddeb1eb /src/map/pc.c | |
| parent | 7e832b12e57cf3d927306048804384a7a08ff6b7 (diff) | |
| download | tmwa-295cecfcc93d4d9cf9c8a8b28f44296be826a392.tar.gz tmwa-295cecfcc93d4d9cf9c8a8b28f44296be826a392.tar.bz2 tmwa-295cecfcc93d4d9cf9c8a8b28f44296be826a392.tar.xz tmwa-295cecfcc93d4d9cf9c8a8b28f44296be826a392.zip | |
Remove conflict markers
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index d9fa391..6a2f4f4 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5115,22 +5115,13 @@ int pc_checkjoblevelup (struct map_session_data *sd) if (sd->status.job_exp >= next && next > 0) { - -<<<<<<< Updated upstream if (pc_skillpt_potential (sd) < sd->status.skill_point) { // [Fate] Bah, this is is painful. // But the alternative is quite error-prone, and eAthena has far worse performance issues... sd->status.job_exp = next - 1; + pc_calcstatus(sd,0); return 0; } -======= - if (pc_skillpt_potential(sd) <= sd->status.skill_point) { // [Fate] Bah, this is is painful. - // But the alternative is quite error-prone, and eAthena has far worse performance issues... - sd->status.job_exp = next - 1; - pc_calcstatus(sd,0); - return 0; - } ->>>>>>> Stashed changes // job�����x���A�b�v���� sd->status.job_exp -= next; @@ -5552,45 +5543,24 @@ int pc_statusup2 (struct map_session_data *sd, int type, int val) * �X�L���|�C���g�����U�� *------------------------------------------ */ -<<<<<<< Updated upstream int pc_skillup (struct map_session_data *sd, int skill_num) { nullpo_retr (0, sd); if (sd->status.skill[skill_num].id != 0 - && sd->status.skill_point > sd->status.skill[skill_num].lv + && sd->status.skill_point >= sd->status.skill[skill_num].lv && sd->status.skill[skill_num].lv < skill_db[skill_num].max_raise) { - sd->status.skill[skill_num].lv++; sd->status.skill_point -= sd->status.skill[skill_num].lv; + sd->status.skill[skill_num].lv++; pc_calcstatus (sd, 0); clif_skillup (sd, skill_num); clif_updatestatus (sd, SP_SKILLPOINT); clif_skillinfoblock (sd); - MAP_LOG_PC (sd, "SKILLUP %d %d %d", - skill_num, sd->status.skill[skill_num].lv, - skill_power (sd, skill_num)); - } -======= -int pc_skillup(struct map_session_data *sd,int skill_num) -{ - nullpo_retr(0, sd); - - if (sd->status.skill[skill_num].id !=0 - && sd->status.skill_point >= sd->status.skill[skill_num].lv - && sd->status.skill[skill_num].lv < skill_db[skill_num].max_raise) { - sd->status.skill_point -= sd->status.skill[skill_num].lv; - sd->status.skill[skill_num].lv++; - - pc_calcstatus(sd,0); - clif_skillup(sd,skill_num); - clif_updatestatus(sd,SP_SKILLPOINT); - clif_skillinfoblock(sd); - MAP_LOG_PC(sd, "SKILLUP %d %d %d", - skill_num, sd->status.skill[skill_num].lv, skill_power(sd, skill_num)); - } ->>>>>>> Stashed changes + MAP_LOG_PC(sd, "SKILLUP %d %d %d", + skill_num, sd->status.skill[skill_num].lv, skill_power(sd, skill_num)); + } return 0; } |