diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/status.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 6059c9d5a..156e58627 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2004/12/06 + * Changed the order of view-change packets for SC xmas/wedding, should fix + crashing if you change into xmas suit while in fighting stance. [Skotlex] * Renamed the mob mode Cast-Sensor Melee to Cast-Sensor idle since these mobs really should only be cast-sensing when they are not after another target. [Skotlex] diff --git a/src/map/status.c b/src/map/status.c index 802a16473..b69417757 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5041,9 +5041,9 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val val3 = vd->shield; val4 = vd->cloth_color; unit_stop_attack(bl); - clif_changelook(bl,LOOK_BASE,type==SC_WEDDING?JOB_WEDDING:JOB_XMAS); clif_changelook(bl,LOOK_WEAPON,0); clif_changelook(bl,LOOK_SHIELD,0); + clif_changelook(bl,LOOK_BASE,type==SC_WEDDING?JOB_WEDDING:JOB_XMAS); clif_changelook(bl,LOOK_CLOTHES_COLOR,vd->cloth_color); break; case SC_NOCHAT: @@ -5670,9 +5670,9 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val switch (type) { case SC_WEDDING: case SC_XMAS: - clif_changelook(bl,LOOK_BASE,type==SC_WEDDING?JOB_WEDDING:JOB_XMAS); clif_changelook(bl,LOOK_WEAPON,0); clif_changelook(bl,LOOK_SHIELD,0); + clif_changelook(bl,LOOK_BASE,type==SC_WEDDING?JOB_WEDDING:JOB_XMAS); clif_changelook(bl,LOOK_CLOTHES_COLOR,val4); break; case SC_KAAHI: @@ -6023,9 +6023,9 @@ int status_change_end( struct block_list* bl , int type,int tid ) vd->cloth_color = sc->data[type].val4; } clif_changelook(bl,LOOK_BASE,vd->class_); + clif_changelook(bl,LOOK_CLOTHES_COLOR,vd->cloth_color); clif_changelook(bl,LOOK_WEAPON,vd->weapon); clif_changelook(bl,LOOK_SHIELD,vd->shield); - clif_changelook(bl,LOOK_CLOTHES_COLOR,vd->cloth_color); break; case SC_RUN: { |