- Removed SP_DISGUISE from the bonus list.

- Moved Sharp Shooting display to the block with Auto-Counter (since that's the other skill that can show critical as well)
- Corrected some fields in the still packet (guild emblem being stored as a Long when it should be Short)
- Modified most fields of view_data to be unsigned shorts rather than signed ones.
- On-Touch NPCs will now make you stop walking when you trigger them.
- Reduced stun duration of most skills to 3 secs.
- ShadowJump/JumpKick will make you land on the target's cell now.
- Fixed Kaahi triggering only once per skill duration.
- Added the kaahi_heal_timer to the list of status change functions.


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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 0d0f0d017..9cecbf858 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -775,7 +775,7 @@ int clif_clearchar_id(int id, int type, int fd) {
 	return 0;

 }

 

-void clif_get_weapon_view(TBL_PC* sd, short *rhand, short *lhand)

+void clif_get_weapon_view(TBL_PC* sd, unsigned short *rhand, unsigned short *lhand)

 {

 #if PACKETVER > 3

 	struct item_data *id;

@@ -884,7 +884,7 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
 		WBUFW(buf,30)=vd->cloth_color;

 		WBUFW(buf,32)=sd?sd->head_dir:dir;

 		WBUFL(buf,34)=guild_id;

-		WBUFL(buf,38)=emblem_id;

+		WBUFW(buf,38)=emblem_id;

 		if (sd) {

 			WBUFW(buf,40)=sd->status.manner;

 			WBUFB(buf,44)=sd->status.karma;

@@ -907,6 +907,7 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
 			WBUFW(buf,8)=sc->opt1;

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

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

+			WBUFW(buf,42)=sc->opt3;

 		}

 		WBUFW(buf,14)=vd->class_;

 		WBUFW(buf,16)=vd->hair_style;

@@ -920,10 +921,8 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
 		WBUFW(buf,32)=sd?sd->head_dir:dir;

 		WBUFL(buf,34)=guild_id;

 		WBUFL(buf,38)=emblem_id;

-		if (sd) {

-			WBUFW(buf,42)=sd->status.manner;

+		if (sd)

 			WBUFB(buf,44)=sd->status.karma;

-		}

 		WBUFB(buf,45)=vd->sex;

 		WBUFPOS(buf,46,bl->x,bl->y);

 		WBUFB(buf,48)|=dir&0x0f;

@@ -944,6 +943,7 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
 		WBUFW(buf,8)=sc->opt1;

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

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

+		WBUFW(buf,42)=sc->opt3;

 	}

 	WBUFW(buf,14)=vd->class_;

 	WBUFW(buf,16)=vd->hair_style;  //Required for pets.