summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--db/packet_db.txt12
-rw-r--r--src/char/int_guild.c2
-rw-r--r--src/map/clif.c2
4 files changed, 14 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 42c756fe8..e589a90ed 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.
2007/11/26
+ * Fixed guild expulsion not working correctly [ultramage]
* Fixed a memory leak in mail_savemessage (src\char_sql\int_mail.c). [FlavioJS]
2007/11/25
* Rev. 11804 Giant Fly Wings are now blocked on noteleport maps and duels. [L0ne_W0lf]
diff --git a/db/packet_db.txt b/db/packet_db.txt
index d26e9cbc5..0f8b9f61a 100644
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -258,7 +258,7 @@ packet_ver: 5
0x0158,-1
0x0159,54,guildleave,2:6:10:14
0x015a,66
-0x015b,54,guildexplusion,2:6:10:14
+0x015b,54,guildexpulsion,2:6:10:14
0x015c,90
0x015d,42,guildbreak,2
0x015e,6
@@ -1058,5 +1058,15 @@ packet_ver: 22
0x015b,-1
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
//packet_ver: 23
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 685ef1d00..bb0e606cc 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -233,7 +233,7 @@ int inter_guild_fromstr(char *str, struct guild *g) {
for(j = 0; j < 4 && str != NULL; j++) // 位置スキップ
str = strchr(str + 1, '\t');
}
-// printf("GuildExplusionInfo OK\n");
+// printf("GuildExpulsionInfo OK\n");
// ギルドスキル
for(i = 0; i < MAX_GUILDSKILL; i++) {
if (sscanf(str+1,"%d,%d ", &tmp_int[0], &tmp_int[1]) < 2)
diff --git a/src/map/clif.c b/src/map/clif.c
index 8a485e755..2dfad87a8 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11839,7 +11839,7 @@ static int packetdb_readdb(void)
{clif_parse_GuildInvite,"guildinvite"},
{clif_parse_GuildReplyInvite,"guildreplyinvite"},
{clif_parse_GuildLeave,"guildleave"},
- {clif_parse_GuildExpulsion,"guildexplusion"},
+ {clif_parse_GuildExpulsion,"guildexpulsion"},
{clif_parse_GuildMessage,"guildmessage"},
{clif_parse_GuildRequestAlliance,"guildrequestalliance"},
{clif_parse_GuildReplyAlliance,"guildreplyalliance"},