summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-26 15:14:52 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-26 15:14:52 +0000
commit928c64f273a8d50498601c51536d638cf866ab12 (patch)
treeead308e7fe021d70acb621665ca9c0a5f2faed5c /src
parent0992d2bd872ba93653f3af9a8233f6133fe8455c (diff)
downloadhercules-928c64f273a8d50498601c51536d638cf866ab12.tar.gz
hercules-928c64f273a8d50498601c51536d638cf866ab12.tar.bz2
hercules-928c64f273a8d50498601c51536d638cf866ab12.tar.xz
hercules-928c64f273a8d50498601c51536d638cf866ab12.zip
Fixed guild expulsion not working correctly.
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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11808 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/char/int_guild.c2
-rw-r--r--src/map/clif.c2
2 files changed, 2 insertions, 2 deletions
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"},