Browse Source

* Updated guild expel notification packet 0x15c (ZC_ACK_BAN_GUILD) for clients 2010-06-08aRagexeRE and newer to 0x839.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14718 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 14 years ago
parent
commit
7aedde90e8
3 changed files with 12 additions and 4 deletions
  1. 1 0
      Changelog-Trunk.txt
  2. 1 1
      db/packet_db.txt
  3. 10 3
      src/map/clif.c

+ 1 - 0
Changelog-Trunk.txt

@@ -1,6 +1,7 @@
 Date	Added
 
 2011/02/19
+	* Updated guild expel notification packet 0x15c (ZC_ACK_BAN_GUILD) for clients 2010-06-08aRagexeRE and newer to 0x839. [Ai4rei]
 	* Removed '.txt' from log config info messages, as the values already have an extension (since r197, related r196). [Ai4rei]
 	* Fixed gcc compile warnings in char-server and console plug-in (bugreport:4771, topic:208746, since r9631 and r14700). [Ai4rei]
 	* Fixed buying stores could be opened and sold to regardless of distance between seller and buyer (since r14713). [Ai4rei]

+ 1 - 1
db/packet_db.txt

@@ -1548,7 +1548,7 @@ packet_ver: 25
 
 //2010-06-08aRagexeRE
 //0x0838,2
-//0x0839,66
+0x0839,66
 //0x083A,4 	// Search Stalls Feature
 //0x083B,2
 //0x083C,12

+ 10 - 3
src/map/clif.c

@@ -6994,14 +6994,21 @@ int clif_guild_leave(struct map_session_data *sd,const char *name,const char *me
 int clif_guild_expulsion(struct map_session_data *sd,const char *name,const char *mes,int account_id)
 {
 	unsigned char buf[128];
+#if PACKETVER < 20100608
+	const unsigned short cmd = 0x15c;
+#else
+	const unsigned short cmd = 0x839;
+#endif
 
 	nullpo_ret(sd);
 
-	WBUFW(buf, 0)=0x15c;
+	WBUFW(buf,0) = cmd;
 	safestrncpy((char*)WBUFP(buf, 2),name,NAME_LENGTH);
 	safestrncpy((char*)WBUFP(buf,26),mes,40);
+#if PACKETVER < 20100608
 	safestrncpy((char*)WBUFP(buf,66),"",NAME_LENGTH); // account name (not used for security reasons)
-	clif_send(buf,packet_len(0x15c),&sd->bl,GUILD_NOBG);
+#endif
+	clif_send(buf,packet_len(cmd),&sd->bl,GUILD_NOBG);
 	return 0;
 }
 
@@ -14747,7 +14754,7 @@ static int packetdb_readdb(void)
 #endif
 	    3, -1,  8, -1,  86, 2,  6,  6, -1, -1,  4, 10, 10,  0,  0,  0,
 	    0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+	    0,  0,  0,  0,  0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,
 	};
 	struct {
 		void (*func)(int, struct map_session_data *);