summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-06 21:30:45 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-06 21:30:45 +0000
commitd3fbebfc6afe5facaa743cf65c7984281c4d8582 (patch)
tree709585335e608cc1a6b331effc780f94d8ed5675 /src/map
parent492c1822dc5c36972ed21873af9b353ec1864b20 (diff)
downloadhercules-d3fbebfc6afe5facaa743cf65c7984281c4d8582.tar.gz
hercules-d3fbebfc6afe5facaa743cf65c7984281c4d8582.tar.bz2
hercules-d3fbebfc6afe5facaa743cf65c7984281c4d8582.tar.xz
hercules-d3fbebfc6afe5facaa743cf65c7984281c4d8582.zip
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9427 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/status.c6
1 files changed, 3 insertions, 3 deletions
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:
{