- Found the position of emblem_id in packet 1b6, commented out the old fix while it's in trial period.

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

2 files changed, 5 insertions, 2 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index d32b3fd05..75498e7fb 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2004/12/05
+	* Found the position of emblem_id in packet 1b6. [FlavioJS]
 	* Moved START_ACCOUNT_NUM and END_ACCOUNT_NUM from login.h to mmo.h and 
 	  changed clif_guess_PacketVer to use that. [FlavioJS]
 	* Made the script engine big-endian compatible. [FlavioJS]
diff --git a/src/map/clif.c b/src/map/clif.c
index b419fdae6..97b66d539 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5992,6 +5992,7 @@ int clif_party_option(struct party_data *p,struct map_session_data *sd,int flag)
 	if(sd==NULL)
 		return 0;
 	WBUFW(buf,0)=0x101;
+	// WBUFL(buf,2) // that's how the client reads it, still need to check it's uses [FlavioJS]
 	WBUFW(buf,2)=((flag&0x01)?2:p->party.exp);
 	WBUFW(buf,4)=0; //NOTE: We don't know yet what this is for, it is NOT for item share rules, though. [Skotlex]
 	if(flag==0)
@@ -6830,7 +6831,7 @@ int clif_guild_basicinfo(struct map_session_data *sd)
 	WFIFOL(fd,30)=0;	// Tax Points
 	WFIFOL(fd,34)=0;	// Tendency: (left) Vulgar [-100,100] Famed (right)
 	WFIFOL(fd,38)=0;	// Tendency: (down) Wicked [-100,100] Righteous (up)
-	WFIFOL(fd,42)=0;	//## Unknown... // �l�”�H
+	WFIFOL(fd,42)=g->emblem_id;
 	memcpy(WFIFOP(fd,46),g->name, NAME_LENGTH);
 	memcpy(WFIFOP(fd,70),g->master, NAME_LENGTH);
 
@@ -6845,7 +6846,8 @@ int clif_guild_basicinfo(struct map_session_data *sd)
 		strncpy((char*)WFIFOP(fd,94),msg_txt(299),20);
 
 	WFIFOSET(fd,packet_len_table[WFIFOW(fd,0)]);
-	clif_guild_emblem(sd,g);	// Guild emblem vanish fix [Valaris]
+	// Found the appropriate packet field, testing for a trial period. [FlavioJS]
+	//clif_guild_emblem(sd,g);	// Guild emblem vanish fix [Valaris]
 	return 0;
 }