summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-12 16:33:26 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-12 16:33:26 +0000
commit77cec53b1c176be9c2dcc1b8e90a1b2695622e5a (patch)
treeddfa9896eac64d644512ec42023205b039bf7e83 /src
parent2b3e4c43331129d890306bfc57c92e260edd13bc (diff)
downloadhercules-77cec53b1c176be9c2dcc1b8e90a1b2695622e5a.tar.gz
hercules-77cec53b1c176be9c2dcc1b8e90a1b2695622e5a.tar.bz2
hercules-77cec53b1c176be9c2dcc1b8e90a1b2695622e5a.tar.xz
hercules-77cec53b1c176be9c2dcc1b8e90a1b2695622e5a.zip
- Modifed a bit the clif_change_look function, it should fix crashes with the Xmas sprite when changing maps.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9478 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 118260197..11c7a4338 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2857,11 +2857,19 @@ int clif_changelook(struct block_list *bl,int type,int val)
switch(type) {
case LOOK_WEAPON:
- if (sd) clif_get_weapon_view(sd, &vd->weapon, &vd->shield);
+ if (sd)
+ {
+ clif_get_weapon_view(sd, &vd->weapon, &vd->shield);
+ val = vd->weapon;
+ }
else vd->weapon = val;
break;
case LOOK_SHIELD:
- if (sd) clif_get_weapon_view(sd, &vd->weapon, &vd->shield);
+ if (sd)
+ {
+ clif_get_weapon_view(sd, &vd->weapon, &vd->shield);
+ val = vd->shield;
+ }
else vd->shield = val;
break;
case LOOK_BASE: