- Changed the order of view-change packets for SC xmas/wedding, should fix crashing if you change into xmas suit while in fighting stance.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9427 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-12-06 21:30:45 +00:00
parent 8b8aa14493
commit 3f3172a720
2 changed files with 5 additions and 3 deletions

View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2004/12/06 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 * 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 mobs really should only be cast-sensing when they are not after another
target. [Skotlex] target. [Skotlex]

View File

@ -5041,9 +5041,9 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
val3 = vd->shield; val3 = vd->shield;
val4 = vd->cloth_color; val4 = vd->cloth_color;
unit_stop_attack(bl); 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_WEAPON,0);
clif_changelook(bl,LOOK_SHIELD,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); clif_changelook(bl,LOOK_CLOTHES_COLOR,vd->cloth_color);
break; break;
case SC_NOCHAT: 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) { switch (type) {
case SC_WEDDING: case SC_WEDDING:
case SC_XMAS: 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_WEAPON,0);
clif_changelook(bl,LOOK_SHIELD,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); clif_changelook(bl,LOOK_CLOTHES_COLOR,val4);
break; break;
case SC_KAAHI: 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; vd->cloth_color = sc->data[type].val4;
} }
clif_changelook(bl,LOOK_BASE,vd->class_); 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_WEAPON,vd->weapon);
clif_changelook(bl,LOOK_SHIELD,vd->shield); clif_changelook(bl,LOOK_SHIELD,vd->shield);
clif_changelook(bl,LOOK_CLOTHES_COLOR,vd->cloth_color);
break; break;
case SC_RUN: case SC_RUN:
{ {