summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-24 18:09:52 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-24 18:09:52 +0000
commit2e1c55543751e1d10085e6e5d98601b7771f455a (patch)
tree985423ffcd2ae590cd65bdbb7b06382f29fc5a17 /src/map
parentacd2064b659b65b63fe8b577ad77fa1ebc5f6dc7 (diff)
downloadhercules-2e1c55543751e1d10085e6e5d98601b7771f455a.tar.gz
hercules-2e1c55543751e1d10085e6e5d98601b7771f455a.tar.bz2
hercules-2e1c55543751e1d10085e6e5d98601b7771f455a.tar.xz
hercules-2e1c55543751e1d10085e6e5d98601b7771f455a.zip
- Corrected offset for the pet hairstyle in the spawn packet (0x7c). I still can't figure out where the pet-equip offset should go, it appears this packet does not supports it.
- Moved the location of the clif_insight call in LoadEndAck to prevent the homunc/pet spawn packets from being sent twice to the owner. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10066 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 457abb254..a06857834 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1328,8 +1328,8 @@ int clif_spawn(struct block_list *bl)
WBUFW(buf,10)=sc->opt2;
WBUFW(buf,12)=sc->option;
}
+ WBUFW(buf,14)=vd->hair_style; //Required for pets.
WBUFW(buf,20)=vd->class_;
- WBUFW(buf,22)=vd->hair_style; //Required for pets.
WBUFW(buf,24)=vd->head_bottom; //Pet armor
WBUFPOS(buf,36,bl->x,bl->y,unit_getdir(bl));
@@ -2054,7 +2054,7 @@ int clif_delitem(struct map_session_data *sd,int n,int amount)
nullpo_retr(0, sd);
fd=sd->fd;
- WFIFOHEAD(fd, packet_len(0xaf));
+ WFIFOHEAD(fd, packet_len(0xaf));
WFIFOW(fd,0)=0xaf;
WFIFOW(fd,2)=n+2;
WFIFOW(fd,4)=amount;
@@ -8154,6 +8154,10 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
if(map_flag_gvg(sd->bl.m))
clif_set0199(fd,3);
+ map_foreachinarea(clif_getareachar,sd->bl.m,
+ sd->bl.x-AREA_SIZE,sd->bl.y-AREA_SIZE,sd->bl.x+AREA_SIZE,sd->bl.y+AREA_SIZE,
+ BL_ALL,sd);
+
// pet
if(sd->pd) {
map_addblock(&sd->pd->bl);
@@ -8262,10 +8266,6 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
clif_weather_check(sd);
- map_foreachinarea(clif_getareachar,sd->bl.m,
- sd->bl.x-AREA_SIZE,sd->bl.y-AREA_SIZE,sd->bl.x+AREA_SIZE,sd->bl.y+AREA_SIZE,
- BL_ALL,sd);
-
// For automatic triggering of NPCs after map loading (so you don't need to walk 1 step first)
if (map_getcell(sd->bl.m,sd->bl.x,sd->bl.y,CELL_CHKNPC))
npc_touch_areanpc(sd,sd->bl.m,sd->bl.x,sd->bl.y);
@@ -9225,7 +9225,7 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd)
return;
}
- //Client doesn't send the position for ammo.
+ //Client doesn't sends the position for ammo.
if(sd->inventory_data[index]->type == IT_AMMO)
pc_equipitem(sd,index,EQP_AMMO);
else