- Fixed packet 0x22a having the manner and opt3 packets in inverted offsets.

- Some other small cleanups on clif.c


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

3 files changed, 15 insertions, 9 deletions

diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index a676de285..0d3c25787 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -921,7 +921,7 @@ int mapif_guild_castle_alldataload_sub(DBKey key, void *data, va_list ap) {
 int mapif_guild_castle_alldataload(int fd) {

 	int len = 4;

 

-        WFIFOHEAD(fd, 0);

+	WFIFOHEAD(fd, 0);

 	WFIFOW(fd,0) = 0x3842;

 	castle_db->foreach(castle_db, mapif_guild_castle_alldataload_sub, fd, &len);

 	WFIFOW(fd,2) = len;

diff --git a/src/map/clif.c b/src/map/clif.c
index f7a54b28e..eeb866c43 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -908,7 +908,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;

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

-			WBUFL(buf,42)=sc->opt3;

+			WBUFL(buf,44)=sc->opt3;

 		}

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

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

@@ -923,7 +923,7 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
 		WBUFL(buf,36)=guild_id;

 		WBUFW(buf,40)=emblem_id;

 		if (sd) {

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

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

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

 		}

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

@@ -3876,18 +3876,22 @@ void clif_getareachar_char(struct map_session_data* sd,struct block_list *bl)
 	ud = unit_bl2ud(bl);

 	if (ud && ud->walktimer != -1)

 	{

-#if PACKETVER < 4

-		WFIFOHEAD(sd->fd, packet_len_table[0x7b]);

-#else

+#if PACKETVER > 6

+		WFIFOHEAD(sd->fd, packet_len_table[0x22c]);

+#elif PACKETVER > 3

 		WFIFOHEAD(sd->fd, packet_len_table[0x1da]);

+#else

+		WFIFOHEAD(sd->fd, packet_len_table[0x7b]);

 #endif

 		len = clif_set007b(bl,vd,ud,WFIFOP(sd->fd,0));

 		WFIFOSET(sd->fd,len);

 	} else {

-#if PACKETVER < 4

-		WFIFOHEAD(sd->fd,packet_len_table[0x78]);

-#else

+#if PACKETVER > 6

+		WFIFOHEAD(sd->fd,packet_len_table[0x22a]);

+#elif PACKETVER > 3

 		WFIFOHEAD(sd->fd,packet_len_table[0x1d8]);

+#else

+		WFIFOHEAD(sd->fd,packet_len_table[0x78]);

 #endif

 		len = clif_set0078(bl,vd,WFIFOP(sd->fd,0));

 		WFIFOSET(sd->fd,len);

diff --git a/src/map/party.c b/src/map/party.c
index 2fbf363bd..490f5eb19 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -477,6 +477,8 @@ int party_optionchanged(int party_id,int account_id,int exp,int item,int flag)
 		p->party.item=item;

 		clif_party_main_info(p,-1);

 	}

+	if(flag&0x01) //Send denied message

+		clif_party_option(p,sd,flag);

 	return 0;

 }