Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed guild expulsion not working correctly.

Browse Source 
Corrected explusion -> expulsion typo.
Added packets from 2007-11-20a sakexe; there are some changes but can't test them yet, so they're left commented out.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11808 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-11-26 15:14:52 +00:00
parent 78571e990c
commit 6e3396f84c
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/11/26 2007/11/26
* Fixed guild expulsion not working correctly [ultramage]
* Fixed a memory leak in mail_savemessage (src\char_sql\int_mail.c). [FlavioJS] * Fixed a memory leak in mail_savemessage (src\char_sql\int_mail.c). [FlavioJS]
2007/11/25 2007/11/25
* Rev. 11804 Giant Fly Wings are now blocked on noteleport maps and duels. [L0ne_W0lf] * Rev. 11804 Giant Fly Wings are now blocked on noteleport maps and duels. [L0ne_W0lf]

12
db/packet_db.txt
View File

@ -258,7 +258,7 @@ packet_ver: 5
0x0158,-1 0x0158,-1
0x0159,54,guildleave,2:6:10:14 0x0159,54,guildleave,2:6:10:14
0x015a,66 0x015a,66
0x015b,54,guildexplusion,2:6:10:14 0x015b,54,guildexpulsion,2:6:10:14
0x015c,90 0x015c,90
0x015d,42,guildbreak,2 0x015d,42,guildbreak,2
0x015e,6 0x015e,6
@ -1058,5 +1058,15 @@ packet_ver: 22
0x015b,-1 0x015b,-1
0x02e1,33 0x02e1,33
//2007-11-20aSakexe
0x015b,54,guildexpulsion,2:6:10:14
//0x01df,10,gmreqnochatcount,2 <- TODO
//0x01f3,0
0x02e2,14
0x02e3,25
0x02e4,8
0x02e5,8
0x02e6,6
//Add new packets here //Add new packets here
//packet_ver: 23 //packet_ver: 23

2
src/char/int_guild.c
View File

@ -233,7 +233,7 @@ int inter_guild_fromstr(char *str, struct guild *g) {
for(j = 0; j < 4 && str != NULL; j++) // 位置スキップ for(j = 0; j < 4 && str != NULL; j++) // 位置スキップ
str = strchr(str + 1, '\t'); str = strchr(str + 1, '\t');
} }
// printf("GuildExplusionInfo OK\n"); // printf("GuildExpulsionInfo OK\n");
// ギルドスキル // ギルドスキル
for(i = 0; i < MAX_GUILDSKILL; i++) { for(i = 0; i < MAX_GUILDSKILL; i++) {
if (sscanf(str+1,"%d,%d ", &tmp_int[0], &tmp_int[1]) < 2) if (sscanf(str+1,"%d,%d ", &tmp_int[0], &tmp_int[1]) < 2)

2
src/map/clif.c
View File

@ -11839,7 +11839,7 @@ static int packetdb_readdb(void)
{clif_parse_GuildInvite,"guildinvite"}, {clif_parse_GuildInvite,"guildinvite"},
{clif_parse_GuildReplyInvite,"guildreplyinvite"}, {clif_parse_GuildReplyInvite,"guildreplyinvite"},
{clif_parse_GuildLeave,"guildleave"}, {clif_parse_GuildLeave,"guildleave"},
{clif_parse_GuildExpulsion,"guildexplusion"}, {clif_parse_GuildExpulsion,"guildexpulsion"},
{clif_parse_GuildMessage,"guildmessage"}, {clif_parse_GuildMessage,"guildmessage"},
{clif_parse_GuildRequestAlliance,"guildrequestalliance"}, {clif_parse_GuildRequestAlliance,"guildrequestalliance"},
{clif_parse_GuildReplyAlliance,"guildreplyalliance"}, {clif_parse_GuildReplyAlliance,"guildreplyalliance"},