- Corrected @whomap directly invoking msg_table[] rather than msg_txt()

- Guessed where the pet data goes in spawn packet 0x7c
- Updated Charge Attack's state from none to move_enable.
- Made tomahawk an NPC_SKILL so that it may not be plagiarized.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6459 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 9 insertions, 3 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 51f8c5bb2..fb2157989 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1334,13 +1334,19 @@ int clif_spawn(struct block_list *bl)
 

 	} else {	//Mob spawn packet.

 		struct status_change *sc = status_get_sc(bl);

+		memset(buf,0,sizeof(buf));

 		WBUFW(buf,0)=0x7c;

 		WBUFL(buf,2)=bl->id;

 		WBUFW(buf,6)=status_get_speed(bl);

-		WBUFW(buf,8)=sc?sc->opt1:0;

-		WBUFW(buf,10)=sc?sc->opt2:0;

-		WBUFW(buf,12)=sc?sc->option:0;

+		if (sc) {

+			WBUFW(buf,8)=sc->opt1;

+			WBUFW(buf,10)=sc->opt2;

+			WBUFW(buf,12)=sc->option;

+		}

 		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);

 		clif_send(buf,packet_len_table[0x7c],bl,AREA_WOS);

 		if (disguised(bl)) {