Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed losing skill list after base change. (bugreport:3106)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13812 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Inkfish 2009-05-25 10:32:06 +00:00
parent e8e8e35eed
commit c61942c8cd
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. 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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
09/05/25
* Fixed losing skill list after base change. (bugreport:3106) [Inkfish]
09/05/24 09/05/24
* Taro Card can now break shoes and garment and won't affect dead target. (bugreport:2513) [Inkfish] * Taro Card can now break shoes and garment and won't affect dead target. (bugreport:2513) [Inkfish]
09/05/23 09/05/23

13
src/map/pc.c
View File

@ -6108,16 +6108,15 @@ int pc_setoption(struct map_session_data *sd,int type)
if (type&OPTION_RIDING && !(p_type&OPTION_RIDING) && (sd->class_&MAPID_BASEMASK) == MAPID_SWORDMAN) if (type&OPTION_RIDING && !(p_type&OPTION_RIDING) && (sd->class_&MAPID_BASEMASK) == MAPID_SWORDMAN)
{ //We are going to mount. [Skotlex] { //We are going to mount. [Skotlex]
new_look = -1;
clif_status_load(&sd->bl,SI_RIDING,1); clif_status_load(&sd->bl,SI_RIDING,1);
status_calc_pc(sd,0); //Mounting/Umounting affects walk and attack speeds. status_calc_pc(sd,0); //Mounting/Umounting affects walk and attack speeds.
} }
else if (!(type&OPTION_RIDING) && p_type&OPTION_RIDING && (sd->class_&MAPID_BASEMASK) == MAPID_SWORDMAN) else if (!(type&OPTION_RIDING) && p_type&OPTION_RIDING && (sd->class_&MAPID_BASEMASK) == MAPID_SWORDMAN)
{ //We are going to dismount. { //We are going to dismount.
new_look = -1;
clif_status_load(&sd->bl,SI_RIDING,0); clif_status_load(&sd->bl,SI_RIDING,0);
status_calc_pc(sd,0); //Mounting/Umounting affects walk and attack speeds. status_calc_pc(sd,0); //Mounting/Umounting affects walk and attack speeds.
} }
if(type&OPTION_CART && !(p_type&OPTION_CART)) if(type&OPTION_CART && !(p_type&OPTION_CART))
{ //Cart On { //Cart On
clif_cartlist(sd); clif_cartlist(sd);
@ -6157,20 +6156,20 @@ int pc_setoption(struct map_session_data *sd,int type)
else if (!(type&OPTION_SUMMER) && p_type&OPTION_SUMMER) else if (!(type&OPTION_SUMMER) && p_type&OPTION_SUMMER)
new_look = -1; new_look = -1;
if (sd->disguise) if (sd->disguise || !new_look)
return 0; //Disguises break sprite changes return 0; //Disguises break sprite changes
if (new_look < 0) { //Restore normal look. if (new_look < 0) { //Restore normal look.
status_set_viewdata(&sd->bl, sd->status.class_); status_set_viewdata(&sd->bl, sd->status.class_);
new_look = sd->vd.class_; new_look = sd->vd.class_;
} }
if (new_look) {
//Stop attacking on new view change (to prevent wedding/santa attacks. pc_stop_attack(sd); //Stop attacking on new view change (to prevent wedding/santa attacks.
pc_stop_attack(sd);
clif_changelook(&sd->bl,LOOK_BASE,new_look); clif_changelook(&sd->bl,LOOK_BASE,new_look);
if (sd->vd.cloth_color) if (sd->vd.cloth_color)
clif_changelook(&sd->bl,LOOK_CLOTHES_COLOR,sd->vd.cloth_color); clif_changelook(&sd->bl,LOOK_CLOTHES_COLOR,sd->vd.cloth_color);
} clif_skillinfoblock(sd); // Skill list needs to be updated after base change.
return 0; return 0;
} }

1
src/map/script.c
View File

@ -8636,6 +8636,7 @@ BUILDIN_FUNC(changebase)
clif_changelook(&sd->bl,LOOK_WEAPON,sd->status.weapon); clif_changelook(&sd->bl,LOOK_WEAPON,sd->status.weapon);
if (sd->vd.cloth_color) if (sd->vd.cloth_color)
clif_changelook(&sd->bl,LOOK_CLOTHES_COLOR,sd->vd.cloth_color); clif_changelook(&sd->bl,LOOK_CLOTHES_COLOR,sd->vd.cloth_color);
clif_skillinfoblock(sd);
} }
return 0; return 0;

1
src/map/status.c
View File

@ -6326,6 +6326,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
clif_changelook(bl,LOOK_CLOTHES_COLOR,vd->cloth_color); clif_changelook(bl,LOOK_CLOTHES_COLOR,vd->cloth_color);
clif_changelook(bl,LOOK_WEAPON,vd->weapon); clif_changelook(bl,LOOK_WEAPON,vd->weapon);
clif_changelook(bl,LOOK_SHIELD,vd->shield); clif_changelook(bl,LOOK_SHIELD,vd->shield);
if(sd) clif_skillinfoblock(sd);
break; break;
case SC_RUN: case SC_RUN:
{ {