Remove guilds, finally

If anyone in the future wonders why I did this,
just look at how many lines of code this eliminates.

7 files changed, 3 insertions, 2144 deletions

diff --git a/src/char/char.cpp b/src/char/char.cpp
index acb52fd..90261a8 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -27,7 +27,6 @@
 #include "char.hpp"
 
 #include "inter.hpp"
-#include "int_guild.hpp"
 #include "int_party.hpp"
 #include "int_storage.hpp"
 
@@ -229,7 +228,7 @@ int mmo_char_tostr (char *str, struct mmo_charstatus *p)
 
     str_p += sprintf (str_p, "%d\t%d,%d\t%s\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" "\t%s,%d,%d\t%s,%d,%d,%d\t", p->char_id, p->account_id, p->char_num, p->name,  //
                       p->pc_class, p->base_level, p->job_level, p->base_exp, p->job_exp, p->zeny, p->hp, p->max_hp, p->sp, p->max_sp, p->str, p->agi, p->vit, p->int_, p->dex, p->luk, p->status_point, p->skill_point, p->option, p->karma, p->manner,    //
-                      p->party_id, p->guild_id, 0, p->hair, p->hair_color, p->clothes_color, p->weapon, p->shield, p->head_top, p->head_mid, p->head_bottom, p->last_point.map, p->last_point.x, p->last_point.y,   //
+                      p->party_id, 0/*guild_id*/, 0, p->hair, p->hair_color, p->clothes_color, p->weapon, p->shield, p->head_top, p->head_mid, p->head_bottom, p->last_point.map, p->last_point.x, p->last_point.y,   //
                       p->save_point.map, p->save_point.x, p->save_point.y,
                       p->partner_id);
     for (i = 0; i < 10; i++)
@@ -369,7 +368,7 @@ int mmo_char_fromstr (char *str, struct mmo_charstatus *p)
     p->karma = tmp_int[22];
     p->manner = tmp_int[23];
     p->party_id = tmp_int[24];
-    p->guild_id = tmp_int[25];
+    //p->guild_id = tmp_int[25];
 //  p->pet_id = tmp_int[26];
     p->hair = tmp_int[27];
     p->hair_color = tmp_int[28];
@@ -1003,7 +1002,7 @@ int make_new_char (int fd, unsigned char *dat)
     char_dat[i].karma = 0;
     char_dat[i].manner = 0;
     char_dat[i].party_id = 0;
-    char_dat[i].guild_id = 0;
+    //char_dat[i].guild_id = 0;
     char_dat[i].hair = dat[33];
     char_dat[i].hair_color = dat[31];
     char_dat[i].clothes_color = 0;
@@ -1749,10 +1748,6 @@ int disconnect_player (int accound_id)
 // キャラ削除に伴うデータ削除
 static int char_delete (struct mmo_charstatus *cs)
 {
-
-    // ギルド脱退
-    if (cs->guild_id)
-        inter_guild_leave (cs->guild_id, cs->account_id, cs->char_id);
     // パーティー脱退
     if (cs->party_id)
         inter_party_leave (cs->party_id, cs->account_id);
@@ -2861,12 +2856,6 @@ int search_mapserver (const char *map)
     return -1;
 }
 
-// char_mapifの初期化処理（現在はinter_mapif初期化のみ）
-static int char_mapif_init (int fd)
-{
-    return inter_mapif_init (fd);
-}
-
 //-----------------------------------------------------
 // Test to know if an IP come from LAN or WAN. by [Yor]
 //-----------------------------------------------------
@@ -3430,7 +3419,6 @@ void parse_char (int fd)
                     RFIFOSKIP (fd, 60);
                     realloc_fifo (fd, FIFOSIZE_SERVERLINK,
                                   FIFOSIZE_SERVERLINK);
-                    char_mapif_init (fd);
                     // send gm acccounts level to map-servers
                     len = 4;
                     WFIFOW (fd, 0) = 0x2b15;
diff --git a/src/char/int_guild.cpp b/src/char/int_guild.cpp
deleted file mode 100644
index 318297e..0000000
--- a/src/char/int_guild.cpp
+++ /dev/null
@@ -1,1802 +0,0 @@
-// $Id: int_guild.c,v 1.2 2004/09/25 19:36:53 Akitasha Exp $
-#include "inter.hpp"
-#include "int_guild.hpp"
-#include "int_storage.hpp"
-#include "../common/mmo.hpp"
-#include "char.hpp"
-#include "../common/socket.hpp"
-#include "../common/db.hpp"
-#include "../common/lock.hpp"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-char guild_txt[1024] = "save/guild.txt";
-char castle_txt[1024] = "save/castle.txt";
-
-static struct dbt *guild_db;
-static struct dbt *castle_db;
-
-static int guild_newid = 10000;
-
-static int guild_exp[100];
-
-int  mapif_parse_GuildLeave (int fd, int guild_id, int account_id,
-                             int char_id, int flag, const char *mes);
-int  mapif_guild_broken (int guild_id, int flag);
-int  guild_check_empty (struct guild *g);
-int  guild_calcinfo (struct guild *g);
-int  mapif_guild_basicinfochanged (int guild_id, int type, const void *data,
-                                   int len);
-int  mapif_guild_info (int fd, struct guild *g);
-void guild_break_sub (db_key_t key, db_val_t data, va_list ap);
-
-// ギルドデータの文字列への変換
-static
-int inter_guild_tostr (char *str, struct guild *g)
-{
-    int  i, c, len;
-
-    // 基本データ
-    len = sprintf (str, "%d\t%s\t%s\t%d,%d,%d,%d,%d\t%s#\t%s#\t",
-                   g->guild_id, g->name, g->master,
-                   g->guild_lv, g->max_member, g->exp, g->skill_point,
-                   g->castle_id, g->mes1, g->mes2);
-    // メンバー
-    for (i = 0; i < g->max_member; i++)
-    {
-        struct guild_member *m = &g->member[i];
-        len += sprintf (str + len, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\t%s\t",
-                        m->account_id, m->char_id,
-                        m->hair, m->hair_color, m->gender,
-                        m->pc_class, m->lv, m->exp, m->exp_payper, m->position,
-                        ((m->account_id > 0) ? m->name : "-"));
-    }
-    // 役職
-    for (i = 0; i < MAX_GUILDPOSITION; i++)
-    {
-        struct guild_position *p = &g->position[i];
-        len +=
-            sprintf (str + len, "%d,%d\t%s#\t", p->mode, p->exp_mode,
-                     p->name);
-    }
-    // エンブレム
-    len += sprintf (str + len, "%d,%d,", g->emblem_len, g->emblem_id);
-    for (i = 0; i < g->emblem_len; i++)
-    {
-        len +=
-            sprintf (str + len, "%02x", (unsigned char) (g->emblem_data[i]));
-    }
-    len += sprintf (str + len, "$\t");
-    // 同盟リスト
-    c = 0;
-    for (i = 0; i < MAX_GUILDALLIANCE; i++)
-        if (g->alliance[i].guild_id > 0)
-            c++;
-    len += sprintf (str + len, "%d\t", c);
-    for (i = 0; i < MAX_GUILDALLIANCE; i++)
-    {
-        GuildAlliance *a = &g->alliance[i];
-        if (a->guild_id > 0)
-            len +=
-                sprintf (str + len, "%d,%d\t%s\t", a->guild_id, a->opposition,
-                         a->name);
-    }
-    // 追放リスト
-    c = 0;
-    for (i = 0; i < MAX_GUILDEXPLUSION; i++)
-        if (g->explusion[i].account_id > 0)
-            c++;
-    len += sprintf (str + len, "%d\t", c);
-    for (i = 0; i < MAX_GUILDEXPLUSION; i++)
-    {
-        GuildExpulsion *e = &g->explusion[i];
-        if (e->account_id > 0)
-            len += sprintf (str + len, "%d,%d,%d,%d\t%s\t%s\t%s#\t",
-                            e->account_id, e->rsv1, e->rsv2, e->rsv3,
-                            e->name, e->acc, e->mes);
-    }
-    // ギルドスキル
-    for (i = 0; i < MAX_GUILDSKILL; i++)
-    {
-        len += sprintf (str + len, "%d,%d ", g->skill[i].id, g->skill[i].lv);
-    }
-    len += sprintf (str + len, "\t");
-
-    return 0;
-}
-
-// ギルドデータの文字列からの変換
-static
-int inter_guild_fromstr (char *str, struct guild *g)
-{
-    int  i, j, c;
-    int  tmp_int[16];
-    char tmp_str[4][256];
-    char tmp_str2[4096];
-    char *pstr;
-
-    // 基本データ
-    memset (g, 0, sizeof (struct guild));
-    if (sscanf
-        (str, "%d\t%[^\t]\t%[^\t]\t%d,%d,%d,%d,%d\t%[^\t]\t%[^\t]\t",
-         &tmp_int[0], tmp_str[0], tmp_str[1], &tmp_int[1], &tmp_int[2],
-         &tmp_int[3], &tmp_int[4], &tmp_int[5], tmp_str[2], tmp_str[3]) < 8)
-        return 1;
-
-    g->guild_id = tmp_int[0];
-    g->guild_lv = tmp_int[1];
-    g->max_member = tmp_int[2];
-    g->exp = tmp_int[3];
-    g->skill_point = tmp_int[4];
-    g->castle_id = tmp_int[5];
-    memcpy (g->name, tmp_str[0], 24);
-    memcpy (g->master, tmp_str[1], 24);
-    memcpy (g->mes1, tmp_str[2], 60);
-    memcpy (g->mes2, tmp_str[3], 120);
-    g->mes1[strlen (g->mes1) - 1] = 0;
-    g->mes2[strlen (g->mes2) - 1] = 0;
-
-    for (j = 0; j < 6 && str != NULL; j++)  // 位置スキップ
-        str = strchr (str + 1, '\t');
-//  printf("GuildBaseInfo OK\n");
-
-    // メンバー
-    for (i = 0; i < g->max_member; i++)
-    {
-        struct guild_member *m = &g->member[i];
-        if (sscanf (str + 1, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\t%[^\t]\t",
-                    &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-                    &tmp_int[4], &tmp_int[5], &tmp_int[6], &tmp_int[7],
-                    &tmp_int[8], &tmp_int[9], tmp_str[0]) < 11)
-            return 1;
-        m->account_id = tmp_int[0];
-        m->char_id = 0 /*tmp_int[1]*/;
-        m->hair = tmp_int[2];
-        m->hair_color = tmp_int[3];
-        m->gender = tmp_int[4];
-        m->pc_class = tmp_int[5];
-        m->lv = tmp_int[6];
-        m->exp = tmp_int[7];
-        m->exp_payper = tmp_int[8];
-        m->position = tmp_int[9];
-        memcpy (m->name, tmp_str[0], 24);
-
-        for (j = 0; j < 2 && str != NULL; j++)  // 位置スキップ
-            str = strchr (str + 1, '\t');
-    }
-//  printf("GuildMemberInfo OK\n");
-    // 役職
-    i = 0;
-    while (sscanf (str + 1, "%d,%d%n", &tmp_int[0], &tmp_int[1], &j) == 2
-           && str[1 + j] == '\t')
-    {
-        struct guild_position *p = &g->position[i];
-        if (sscanf
-            (str + 1, "%d,%d\t%[^\t]\t", &tmp_int[0], &tmp_int[1],
-             tmp_str[0]) < 3)
-            return 1;
-        p->mode = tmp_int[0];
-        p->exp_mode = tmp_int[1];
-        tmp_str[0][strlen (tmp_str[0]) - 1] = 0;
-        memcpy (p->name, tmp_str[0], 24);
-
-        for (j = 0; j < 2 && str != NULL; j++)  // 位置スキップ
-            str = strchr (str + 1, '\t');
-        i++;
-    }
-//  printf("GuildPositionInfo OK\n");
-    // エンブレム
-    tmp_int[1] = 0;
-    if (sscanf (str + 1, "%d,%d,%[^\t]\t", &tmp_int[0], &tmp_int[1], tmp_str2)
-        < 3 && sscanf (str + 1, "%d,%[^\t]\t", &tmp_int[0], tmp_str2) < 2)
-        return 1;
-    g->emblem_len = tmp_int[0];
-    g->emblem_id = tmp_int[1];
-    for (i = 0, pstr = tmp_str2; i < g->emblem_len; i++, pstr += 2)
-    {
-        int  c1 = pstr[0], c2 = pstr[1], x1 = 0, x2 = 0;
-        if (c1 >= '0' && c1 <= '9')
-            x1 = c1 - '0';
-        if (c1 >= 'a' && c1 <= 'f')
-            x1 = c1 - 'a' + 10;
-        if (c1 >= 'A' && c1 <= 'F')
-            x1 = c1 - 'A' + 10;
-        if (c2 >= '0' && c2 <= '9')
-            x2 = c2 - '0';
-        if (c2 >= 'a' && c2 <= 'f')
-            x2 = c2 - 'a' + 10;
-        if (c2 >= 'A' && c2 <= 'F')
-            x2 = c2 - 'A' + 10;
-        g->emblem_data[i] = (x1 << 4) | x2;
-    }
-//  printf("GuildEmblemInfo OK\n");
-    str = strchr (str + 1, '\t');   // 位置スキップ
-
-    // 同盟リスト
-    if (sscanf (str + 1, "%d\t", &c) < 1)
-        return 1;
-    str = strchr (str + 1, '\t');   // 位置スキップ
-    for (i = 0; i < c; i++)
-    {
-        GuildAlliance *a = &g->alliance[i];
-        if (sscanf
-            (str + 1, "%d,%d\t%[^\t]\t", &tmp_int[0], &tmp_int[1],
-             tmp_str[0]) < 3)
-            return 1;
-        a->guild_id = tmp_int[0];
-        a->opposition = tmp_int[1];
-        memcpy (a->name, tmp_str[0], 24);
-
-        for (j = 0; j < 2 && str != NULL; j++)  // 位置スキップ
-            str = strchr (str + 1, '\t');
-    }
-//  printf("GuildAllianceInfo OK\n");
-    // 追放リスト
-    if (sscanf (str + 1, "%d\t", &c) < 1)
-        return 1;
-    str = strchr (str + 1, '\t');   // 位置スキップ
-    for (i = 0; i < c; i++)
-    {
-        GuildExpulsion *e = &g->explusion[i];
-        if (sscanf (str + 1, "%d,%d,%d,%d\t%[^\t]\t%[^\t]\t%[^\t]\t",
-                    &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-                    tmp_str[0], tmp_str[1], tmp_str[2]) < 6)
-            return 1;
-        e->account_id = tmp_int[0];
-        e->rsv1 = tmp_int[1];
-        e->rsv2 = tmp_int[2];
-        e->rsv3 = tmp_int[3];
-        memcpy (e->name, tmp_str[0], 24);
-        memcpy (e->acc, tmp_str[1], 24);
-        tmp_str[2][strlen (tmp_str[2]) - 1] = 0;
-        memcpy (e->mes, tmp_str[2], 40);
-
-        for (j = 0; j < 4 && str != NULL; j++)  // 位置スキップ
-            str = strchr (str + 1, '\t');
-    }
-//  printf("GuildExplusionInfo OK\n");
-    // ギルドスキル
-    for (i = 0; i < MAX_GUILDSKILL; i++)
-    {
-        if (sscanf (str + 1, "%d,%d ", &tmp_int[0], &tmp_int[1]) < 2)
-            break;
-        g->skill[i].id = tmp_int[0];
-        g->skill[i].lv = tmp_int[1];
-        str = strchr (str + 1, ' ');
-    }
-    str = strchr (str + 1, '\t');
-//  printf("GuildSkillInfo OK\n");
-
-    return 0;
-}
-
-// ギルド城データの文字列への変換
-static
-int inter_guildcastle_tostr (char *str, struct guild_castle *gc)
-{
-    int  len;
-
-    len = sprintf (str, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",    // added Guardian HP [Valaris]
-                   gc->castle_id, gc->guild_id, gc->economy, gc->defense,
-                   gc->triggerE, gc->triggerD, gc->nextTime, gc->payTime,
-                   gc->createTime, gc->visibleC, gc->visibleG0, gc->visibleG1,
-                   gc->visibleG2, gc->visibleG3, gc->visibleG4, gc->visibleG5,
-                   gc->visibleG6, gc->visibleG7, gc->Ghp0, gc->Ghp1, gc->Ghp2,
-                   gc->Ghp3, gc->Ghp4, gc->Ghp5, gc->Ghp6, gc->Ghp7);
-
-    return 0;
-}
-
-// ギルド城データの文字列からの変換
-static
-int inter_guildcastle_fromstr (char *str, struct guild_castle *gc)
-{
-    int  tmp_int[26];
-
-    memset (gc, 0, sizeof (struct guild_castle));
-    // new structure of guild castle
-    if (sscanf
-        (str,
-         "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
-         &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], &tmp_int[4],
-         &tmp_int[5], &tmp_int[6], &tmp_int[7], &tmp_int[8], &tmp_int[9],
-         &tmp_int[10], &tmp_int[11], &tmp_int[12], &tmp_int[13], &tmp_int[14],
-         &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18], &tmp_int[19],
-         &tmp_int[20], &tmp_int[21], &tmp_int[22], &tmp_int[23], &tmp_int[24],
-         &tmp_int[25]) == 26)
-    {
-        gc->castle_id = tmp_int[0];
-        gc->guild_id = tmp_int[1];
-        gc->economy = tmp_int[2];
-        gc->defense = tmp_int[3];
-        gc->triggerE = tmp_int[4];
-        gc->triggerD = tmp_int[5];
-        gc->nextTime = tmp_int[6];
-        gc->payTime = tmp_int[7];
-        gc->createTime = tmp_int[8];
-        gc->visibleC = tmp_int[9];
-        gc->visibleG0 = tmp_int[10];
-        gc->visibleG1 = tmp_int[11];
-        gc->visibleG2 = tmp_int[12];
-        gc->visibleG3 = tmp_int[13];
-        gc->visibleG4 = tmp_int[14];
-        gc->visibleG5 = tmp_int[15];
-        gc->visibleG6 = tmp_int[16];
-        gc->visibleG7 = tmp_int[17];
-        gc->Ghp0 = tmp_int[18];
-        gc->Ghp1 = tmp_int[19];
-        gc->Ghp2 = tmp_int[20];
-        gc->Ghp3 = tmp_int[21];
-        gc->Ghp4 = tmp_int[22];
-        gc->Ghp5 = tmp_int[23];
-        gc->Ghp6 = tmp_int[24];
-        gc->Ghp7 = tmp_int[25]; // end additions [Valaris]
-        // old structure of guild castle
-    }
-    else if (sscanf
-             (str, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
-              &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], &tmp_int[4],
-              &tmp_int[5], &tmp_int[6], &tmp_int[7], &tmp_int[8], &tmp_int[9],
-              &tmp_int[10], &tmp_int[11], &tmp_int[12], &tmp_int[13],
-              &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17]) == 18)
-    {
-        gc->castle_id = tmp_int[0];
-        gc->guild_id = tmp_int[1];
-        gc->economy = tmp_int[2];
-        gc->defense = tmp_int[3];
-        gc->triggerE = tmp_int[4];
-        gc->triggerD = tmp_int[5];
-        gc->nextTime = tmp_int[6];
-        gc->payTime = tmp_int[7];
-        gc->createTime = tmp_int[8];
-        gc->visibleC = tmp_int[9];
-        gc->visibleG0 = tmp_int[10];
-        gc->visibleG1 = tmp_int[11];
-        gc->visibleG2 = tmp_int[12];
-        gc->visibleG3 = tmp_int[13];
-        gc->visibleG4 = tmp_int[14];
-        gc->visibleG5 = tmp_int[15];
-        gc->visibleG6 = tmp_int[16];
-        gc->visibleG7 = tmp_int[17];
-        if (gc->visibleG0 == 1)
-            gc->Ghp0 = 15670 + 2000 * gc->defense;
-        else
-            gc->Ghp0 = 0;
-        if (gc->visibleG1 == 1)
-            gc->Ghp1 = 15670 + 2000 * gc->defense;
-        else
-            gc->Ghp1 = 0;
-        if (gc->visibleG2 == 1)
-            gc->Ghp2 = 15670 + 2000 * gc->defense;
-        else
-            gc->Ghp2 = 0;
-        if (gc->visibleG3 == 1)
-            gc->Ghp3 = 30214 + 2000 * gc->defense;
-        else
-            gc->Ghp3 = 0;
-        if (gc->visibleG4 == 1)
-            gc->Ghp4 = 30214 + 2000 * gc->defense;
-        else
-            gc->Ghp4 = 0;
-        if (gc->visibleG5 == 1)
-            gc->Ghp5 = 28634 + 2000 * gc->defense;
-        else
-            gc->Ghp5 = 0;
-        if (gc->visibleG6 == 1)
-            gc->Ghp6 = 28634 + 2000 * gc->defense;
-        else
-            gc->Ghp6 = 0;
-        if (gc->visibleG7 == 1)
-            gc->Ghp7 = 28634 + 2000 * gc->defense;
-        else
-            gc->Ghp7 = 0;
-    }
-    else
-    {
-        return 1;
-    }
-
-    return 0;
-}
-
-// ギルド関連データベース読み込み
-static
-int inter_guild_readdb (void)
-{
-    int  i;
-    FILE *fp;
-    char line[1024];
-
-    fp = fopen_ ("db/exp_guild.txt", "r");
-    if (fp == NULL)
-    {
-        printf ("can't read db/exp_guild.txt\n");
-        return 1;
-    }
-    i = 0;
-    while (fgets (line, sizeof (line) - 1, fp) && i < 100)
-    {
-        if (line[0] == '/' && line[1] == '/')
-            continue;
-        guild_exp[i] = atoi (line);
-        i++;
-    }
-    fclose_ (fp);
-
-    return 0;
-}
-
-// ギルドデータの読み込み
-int inter_guild_init (void)
-{
-    char line[16384];
-    struct guild *g;
-    struct guild_castle *gc;
-    FILE *fp;
-    int  i, j, c = 0;
-
-    inter_guild_readdb ();
-
-    guild_db = numdb_init ();
-    castle_db = numdb_init ();
-
-    if ((fp = fopen_ (guild_txt, "r")) == NULL)
-        return 1;
-    while (fgets (line, sizeof (line) - 1, fp))
-    {
-        j = 0;
-        if (sscanf (line, "%d\t%%newid%%\n%n", &i, &j) == 1 && j > 0
-            && guild_newid <= i)
-        {
-            guild_newid = i;
-            continue;
-        }
-        CREATE (g, struct guild, 1);
-        if (inter_guild_fromstr (line, g) == 0 && g->guild_id > 0)
-        {
-            if (g->guild_id >= guild_newid)
-                guild_newid = g->guild_id + 1;
-            numdb_insert (guild_db, g->guild_id, g);
-            guild_check_empty (g);
-            guild_calcinfo (g);
-        }
-        else
-        {
-            printf ("int_guild: broken data [%s] line %d\n", guild_txt, c);
-            free (g);
-        }
-        c++;
-    }
-    fclose_ (fp);
-//  printf("int_guild: %s read done (%d guilds)\n", guild_txt, c);
-
-    c = 0;                      //カウンタ初期化
-
-    if ((fp = fopen_ (castle_txt, "r")) == NULL)
-    {
-        return 1;
-    }
-
-    while (fgets (line, sizeof (line) - 1, fp))
-    {
-        CREATE (gc, struct guild_castle, 1);
-        if (inter_guildcastle_fromstr (line, gc) == 0)
-        {
-            numdb_insert (castle_db, gc->castle_id, gc);
-        }
-        else
-        {
-            printf ("int_guild: broken data [%s] line %d\n", castle_txt, c);
-            free (gc);
-        }
-        c++;
-    }
-
-    if (!c)
-    {
-        printf (" %s - making Default Data...\n", castle_txt);
-        //デフォルトデータを作成
-        for (i = 0; i < MAX_GUILDCASTLE; i++)
-        {
-            CREATE (gc, struct guild_castle, 1);
-            gc->castle_id = i;
-            gc->guild_id = 0;
-            gc->economy = 0;
-            gc->defense = 0;
-            gc->triggerE = 0;
-            gc->triggerD = 0;
-            gc->nextTime = 0;
-            gc->payTime = 0;
-            gc->createTime = 0;
-            gc->visibleC = 0;
-            gc->visibleG0 = 0;
-            gc->visibleG1 = 0;
-            gc->visibleG2 = 0;
-            gc->visibleG3 = 0;
-            gc->visibleG4 = 0;
-            gc->visibleG5 = 0;
-            gc->visibleG6 = 0;
-            gc->visibleG7 = 0;
-            gc->Ghp0 = 0;       // guardian HP [Valaris]
-            gc->Ghp1 = 0;
-            gc->Ghp2 = 0;
-            gc->Ghp3 = 0;
-            gc->Ghp4 = 0;
-            gc->Ghp5 = 0;
-            gc->Ghp6 = 0;
-            gc->Ghp7 = 0;       // end additions [Valaris]
-            numdb_insert (castle_db, gc->castle_id, gc);
-        }
-        printf (" %s - making done\n", castle_txt);
-        return 0;
-    }
-
-    fclose_ (fp);
-
-    return 0;
-}
-
-struct guild *inter_guild_search (int guild_id)
-{
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-
-    return g;
-}
-
-// ギルドデータのセーブ用
-static
-void inter_guild_save_sub (db_key_t key, db_val_t data, va_list ap)
-{
-    char line[16384];
-    FILE *fp;
-
-    inter_guild_tostr (line, (struct guild *) data);
-    fp = va_arg (ap, FILE *);
-    fprintf (fp, "%s\n", line);
-}
-
-// ギルド城データのセーブ用
-static
-void inter_castle_save_sub (db_key_t key, db_val_t data, va_list ap)
-{
-    char line[16384];
-    FILE *fp;
-
-    inter_guildcastle_tostr (line, (struct guild_castle *) data);
-    fp = va_arg (ap, FILE *);
-    fprintf (fp, "%s\n", line);
-}
-
-// ギルドデータのセーブ
-int inter_guild_save (void)
-{
-    FILE *fp;
-    int  lock;
-
-    if ((fp = lock_fopen (guild_txt, &lock)) == NULL)
-    {
-        printf ("int_guild: cant write [%s] !!! data is lost !!!\n",
-                guild_txt);
-        return 1;
-    }
-    numdb_foreach (guild_db, inter_guild_save_sub, fp);
-//  fprintf(fp, "%d\t%%newid%%\n", guild_newid);
-    lock_fclose (fp, guild_txt, &lock);
-//  printf("int_guild: %s saved.\n", guild_txt);
-
-    if ((fp = lock_fopen (castle_txt, &lock)) == NULL)
-    {
-        printf ("int_guild: cant write [%s] !!! data is lost !!!\n",
-                castle_txt);
-        return 1;
-    }
-    numdb_foreach (castle_db, inter_castle_save_sub, fp);
-    lock_fclose (fp, castle_txt, &lock);
-
-    return 0;
-}
-
-// ギルド名検索用
-static
-void search_guildname_sub (db_key_t key, db_val_t data, va_list ap)
-{
-    struct guild *g = (struct guild *) data, **dst;
-    char *str;
-
-    str = va_arg (ap, char *);
-    dst = va_arg (ap, struct guild **);
-    if (strcasecmp (g->name, str) == 0)
-        *dst = g;
-}
-
-// ギルド名検索
-static
-struct guild *search_guildname (const char *str)
-{
-    struct guild *g = NULL;
-    numdb_foreach (guild_db, search_guildname_sub, str, &g);
-    return g;
-}
-
-// ギルドが空かどうかチェック
-int guild_check_empty (struct guild *g)
-{
-    int  i;
-
-    for (i = 0; i < g->max_member; i++)
-    {
-        if (g->member[i].account_id > 0)
-        {
-            return 0;
-        }
-    }
-    // 誰もいないので解散
-    numdb_foreach (guild_db, guild_break_sub, g->guild_id);
-    numdb_erase (guild_db, g->guild_id);
-    inter_guild_storage_delete (g->guild_id);
-    mapif_guild_broken (g->guild_id, 0);
-    free (g);
-
-    return 1;
-}
-
-// キャラの競合がないかチェック用
-static
-void guild_check_conflict_sub (db_key_t key, db_val_t data, va_list ap)
-{
-    struct guild *g = (struct guild *) data;
-    int  guild_id, account_id, char_id, i;
-
-    guild_id = va_arg (ap, int);
-    account_id = va_arg (ap, int);
-    char_id = va_arg (ap, int);
-
-    if (g->guild_id == guild_id)    // 本来の所属なので問題なし
-        return;
-
-    for (i = 0; i < MAX_GUILD; i++)
-    {
-        if (g->member[i].account_id == account_id)
-        {
-            // 別のギルドに偽の所属データがあるので脱退
-            printf ("int_guild: guild conflict! %d,%d %d!=%d\n", account_id,
-                    char_id, guild_id, g->guild_id);
-            mapif_parse_GuildLeave (-1, g->guild_id, account_id, 0 /*char_id*/, 0,
-                                    "**データ競合**");
-        }
-    }
-}
-
-// キャラの競合がないかチェック
-static
-int guild_check_conflict (int guild_id, int account_id, int char_id)
-{
-    numdb_foreach (guild_db, guild_check_conflict_sub, guild_id, account_id,
-                   0 /*char_id*/);
-
-    return 0;
-}
-
-static
-int guild_nextexp (int level)
-{
-    if (level < 100)
-        return guild_exp[level - 1];
-
-    return 0;
-}
-
-// ギルドスキルがあるか確認
-static
-int guild_checkskill (struct guild *g, int id)
-{
-    return g->skill[id - 10000].lv;
-}
-
-// ギルドの情報の再計算
-int guild_calcinfo (struct guild *g)
-{
-    int  i, c, nextexp;
-    struct guild before = *g;
-
-    // スキルIDの設定
-    for (i = 0; i < 5; i++)
-        g->skill[i].id = i + 10000;
-
-    // ギルドレベル
-    if (g->guild_lv <= 0)
-        g->guild_lv = 1;
-    nextexp = guild_nextexp (g->guild_lv);
-    if (nextexp > 0)
-    {
-        while (g->exp >= nextexp)
-        {                       // レベルアップ処理
-            g->exp -= nextexp;
-            g->guild_lv++;
-            g->skill_point++;
-            nextexp = guild_nextexp (g->guild_lv);
-        }
-    }
-
-    // ギルドの次の経験値
-    g->next_exp = guild_nextexp (g->guild_lv);
-
-    // メンバ上限（ギルド拡張適用）
-    g->max_member = 100 + guild_checkskill (g, 10004) * 2;
-
-    // 平均レベルとオンライン人数
-    g->average_lv = 0;
-    g->connect_member = 0;
-    c = 0;
-    for (i = 0; i < g->max_member; i++)
-    {
-        if (g->member[i].account_id > 0)
-        {
-            g->average_lv += g->member[i].lv;
-            c++;
-            if (g->member[i].online > 0)
-                g->connect_member++;
-        }
-    }
-    g->average_lv /= c;
-
-    // 全データを送る必要がありそう
-    if (g->max_member != before.max_member ||
-        g->guild_lv != before.guild_lv ||
-        g->skill_point != before.skill_point)
-    {
-        mapif_guild_info (-1, g);
-        return 1;
-    }
-
-    return 0;
-}
-
-//-------------------------------------------------------------------
-// map serverへの通信
-
-// ギルド作成可否
-static
-int mapif_guild_created (int fd, int account_id, struct guild *g)
-{
-    WFIFOW (fd, 0) = 0x3830;
-    WFIFOL (fd, 2) = account_id;
-    if (g != NULL)
-    {
-        WFIFOL (fd, 6) = g->guild_id;
-        printf ("int_guild: created! %d %s\n", g->guild_id, g->name);
-    }
-    else
-    {
-        WFIFOL (fd, 6) = 0;
-    }
-    WFIFOSET (fd, 10);
-    return 0;
-}
-
-// ギルド情報見つからず
-static
-int mapif_guild_noinfo (int fd, int guild_id)
-{
-    WFIFOW (fd, 0) = 0x3831;
-    WFIFOW (fd, 2) = 8;
-    WFIFOL (fd, 4) = guild_id;
-    WFIFOSET (fd, 8);
-    printf ("int_guild: info not found %d\n", guild_id);
-
-    return 0;
-}
-
-// ギルド情報まとめ送り
-int mapif_guild_info (int fd, struct guild *g)
-{
-    unsigned char buf[4 + sizeof (struct guild)];
-
-    WBUFW (buf, 0) = 0x3831;
-    memcpy (buf + 4, g, sizeof (struct guild));
-    WBUFW (buf, 2) = 4 + sizeof (struct guild);
-//  printf("int_guild: sizeof(guild)=%d\n", sizeof(struct guild));
-    if (fd < 0)
-        mapif_sendall (buf, WBUFW (buf, 2));
-    else
-        mapif_send (fd, buf, WBUFW (buf, 2));
-//  printf("int_guild: info %d %s\n", p->guild_id, p->name);
-
-    return 0;
-}
-
-// メンバ追加可否
-static
-int mapif_guild_memberadded (int fd, int guild_id, int account_id,
-                             int char_id, int flag)
-{
-    WFIFOW (fd, 0) = 0x3832;
-    WFIFOL (fd, 2) = guild_id;
-    WFIFOL (fd, 6) = account_id;
-    WFIFOL (fd, 10) = 0 /*char_id*/;
-    WFIFOB (fd, 14) = flag;
-    WFIFOSET (fd, 15);
-
-    return 0;
-}
-
-// 脱退/追放通知
-static
-int mapif_guild_leaved (int guild_id, int account_id, int char_id, int flag,
-                        const char *name, const char *mes)
-{
-    unsigned char buf[79];
-
-    WBUFW (buf, 0) = 0x3834;
-    WBUFL (buf, 2) = guild_id;
-    WBUFL (buf, 6) = account_id;
-    WBUFL (buf, 10) = 0 /*char_id*/;
-    WBUFB (buf, 14) = flag;
-    memcpy (WBUFP (buf, 15), mes, 40);
-    memcpy (WBUFP (buf, 55), name, 24);
-    mapif_sendall (buf, 79);
-    printf ("int_guild: guild leaved %d %d %s %s\n", guild_id, account_id,
-            name, mes);
-
-    return 0;
-}
-
-// オンライン状態とLv更新通知
-static
-int mapif_guild_memberinfoshort (struct guild *g, int idx)
-{
-    unsigned char buf[19];
-
-    WBUFW (buf, 0) = 0x3835;
-    WBUFL (buf, 2) = g->guild_id;
-    WBUFL (buf, 6) = g->member[idx].account_id;
-    WBUFL (buf, 10) = 0 /*g->member[idx].char_id*/;
-    WBUFB (buf, 14) = g->member[idx].online;
-    WBUFW (buf, 15) = g->member[idx].lv;
-    WBUFW (buf, 17) = g->member[idx].pc_class;
-    mapif_sendall (buf, 19);
-    return 0;
-}
-
-// 解散通知
-int mapif_guild_broken (int guild_id, int flag)
-{
-    unsigned char buf[7];
-
-    WBUFW (buf, 0) = 0x3836;
-    WBUFL (buf, 2) = guild_id;
-    WBUFB (buf, 6) = flag;
-    mapif_sendall (buf, 7);
-    printf ("int_guild: broken %d\n", guild_id);
-
-    return 0;
-}
-
-// ギルド内発言
-static
-int mapif_guild_message (int guild_id, int account_id, const char *mes, int len)
-{
-    unsigned char buf[len + 12];
-
-    WBUFW (buf, 0) = 0x3837;
-    WBUFW (buf, 2) = len + 12;
-    WBUFL (buf, 4) = guild_id;
-    WBUFL (buf, 8) = account_id;
-    memcpy (WBUFP (buf, 12), mes, len);
-    mapif_sendall (buf, len + 12);
-
-    return 0;
-}
-
-// ギルド基本情報変更通知
-int mapif_guild_basicinfochanged (int guild_id, int type, const void *data,
-                                  int len)
-{
-    unsigned char buf[2048];
-
-    WBUFW (buf, 0) = 0x3839;
-    WBUFW (buf, 2) = len + 10;
-    WBUFL (buf, 4) = guild_id;
-    WBUFW (buf, 8) = type;
-    memcpy (WBUFP (buf, 10), data, len);
-    mapif_sendall (buf, len + 10);
-    return 0;
-}
-
-// ギルドメンバ情報変更通知
-static
-int mapif_guild_memberinfochanged (int guild_id, int account_id, int char_id,
-                                   int type, const void *data, int len)
-{
-    unsigned char buf[len + 18];
-
-    WBUFW (buf, 0) = 0x383a;
-    WBUFW (buf, 2) = len + 18;
-    WBUFL (buf, 4) = guild_id;
-    WBUFL (buf, 8) = account_id;
-    WBUFL (buf, 12) = 0 /*char_id*/;
-    WBUFW (buf, 16) = type;
-    memcpy (WBUFP (buf, 18), data, len);
-    mapif_sendall (buf, len + 18);
-
-    return 0;
-}
-
-// ギルドスキルアップ通知
-static
-int mapif_guild_skillupack (int guild_id, int skill_num, int account_id)
-{
-    unsigned char buf[14];
-
-    WBUFW (buf, 0) = 0x383c;
-    WBUFL (buf, 2) = guild_id;
-    WBUFL (buf, 6) = skill_num;
-    WBUFL (buf, 10) = account_id;
-    mapif_sendall (buf, 14);
-
-    return 0;
-}
-
-// ギルド同盟/敵対通知
-static
-int mapif_guild_alliance (int guild_id1, int guild_id2, int account_id1,
-                          int account_id2, int flag, const char *name1,
-                          const char *name2)
-{
-    unsigned char buf[67];
-
-    WBUFW (buf, 0) = 0x383d;
-    WBUFL (buf, 2) = guild_id1;
-    WBUFL (buf, 6) = guild_id2;
-    WBUFL (buf, 10) = account_id1;
-    WBUFL (buf, 14) = account_id2;
-    WBUFB (buf, 18) = flag;
-    memcpy (WBUFP (buf, 19), name1, 24);
-    memcpy (WBUFP (buf, 43), name2, 24);
-    mapif_sendall (buf, 67);
-
-    return 0;
-}
-
-// ギルド役職変更通知
-static
-int mapif_guild_position (struct guild *g, int idx)
-{
-    unsigned char buf[sizeof (struct guild_position) + 12];
-
-    WBUFW (buf, 0) = 0x383b;
-    WBUFW (buf, 2) = sizeof (struct guild_position) + 12;
-    WBUFL (buf, 4) = g->guild_id;
-    WBUFL (buf, 8) = idx;
-    memcpy (WBUFP (buf, 12), &g->position[idx],
-            sizeof (struct guild_position));
-    mapif_sendall (buf, WBUFW (buf, 2));
-
-    return 0;
-}
-
-// ギルド告知変更通知
-static
-int mapif_guild_notice (struct guild *g)
-{
-    unsigned char buf[186];
-
-    WBUFW (buf, 0) = 0x383e;
-    WBUFL (buf, 2) = g->guild_id;
-    memcpy (WBUFP (buf, 6), g->mes1, 60);
-    memcpy (WBUFP (buf, 66), g->mes2, 120);
-    mapif_sendall (buf, 186);
-
-    return 0;
-}
-
-// ギルドエンブレム変更通知
-static
-int mapif_guild_emblem (struct guild *g)
-{
-    unsigned char buf[2048];
-
-    WBUFW (buf, 0) = 0x383f;
-    WBUFW (buf, 2) = g->emblem_len + 12;
-    WBUFL (buf, 4) = g->guild_id;
-    WBUFL (buf, 8) = g->emblem_id;
-    memcpy (WBUFP (buf, 12), g->emblem_data, g->emblem_len);
-    mapif_sendall (buf, WBUFW (buf, 2));
-
-    return 0;
-}
-
-static
-int mapif_guild_castle_dataload (int castle_id, int index, int value)
-{
-    unsigned char buf[9];
-
-    WBUFW (buf, 0) = 0x3840;
-    WBUFW (buf, 2) = castle_id;
-    WBUFB (buf, 4) = index;
-    WBUFL (buf, 5) = value;
-    mapif_sendall (buf, 9);
-
-    return 0;
-}
-
-static
-int mapif_guild_castle_datasave (int castle_id, int index, int value)
-{
-    unsigned char buf[9];
-
-    WBUFW (buf, 0) = 0x3841;
-    WBUFW (buf, 2) = castle_id;
-    WBUFB (buf, 4) = index;
-    WBUFL (buf, 5) = value;
-    mapif_sendall (buf, 9);
-
-    return 0;
-}
-
-static
-void mapif_guild_castle_alldataload_sub (db_key_t key, db_val_t data, va_list ap)
-{
-    int  fd = va_arg (ap, int);
-    int *p = va_arg (ap, int *);
-
-    memcpy (WFIFOP (fd, *p), (struct guild_castle *) data,
-            sizeof (struct guild_castle));
-    (*p) += sizeof (struct guild_castle);
-}
-
-static
-int mapif_guild_castle_alldataload (int fd)
-{
-    int  len = 4;
-
-    WFIFOW (fd, 0) = 0x3842;
-    numdb_foreach (castle_db, mapif_guild_castle_alldataload_sub, fd, &len);
-    WFIFOW (fd, 2) = len;
-    WFIFOSET (fd, len);
-
-    return 0;
-}
-
-//-------------------------------------------------------------------
-// map serverからの通信
-
-// ギルド作成要求
-static
-int mapif_parse_CreateGuild (int fd, int account_id, const char *name,
-                             struct guild_member *master)
-{
-    struct guild *g;
-    int  i;
-
-    for (i = 0; i < 24 && name[i]; i++)
-    {
-        if (!(name[i] & 0xe0) || name[i] == 0x7f)
-        {
-            printf ("int_guild: illeagal guild name [%s]\n", name);
-            mapif_guild_created (fd, account_id, NULL);
-            return 0;
-        }
-    }
-
-    if ((g = search_guildname (name)) != NULL)
-    {
-        printf ("int_guild: same name guild exists [%s]\n", name);
-        mapif_guild_created (fd, account_id, NULL);
-        return 0;
-    }
-    CREATE (g, struct guild, 1);
-    g->guild_id = guild_newid++;
-    memcpy (g->name, name, 24);
-    memcpy (g->master, master->name, 24);
-    memcpy (&g->member[0], master, sizeof (struct guild_member));
-
-    g->position[0].mode = 0x11;
-    strcpy (g->position[0].name, "GuildMaster");
-    strcpy (g->position[MAX_GUILDPOSITION - 1].name, "Newbie");
-    for (i = 1; i < MAX_GUILDPOSITION - 1; i++)
-        sprintf (g->position[i].name, "Position %d", i + 1);
-
-    // ここでギルド情報計算が必要と思われる
-    g->max_member = 100;
-    g->average_lv = master->lv;
-    for (i = 0; i < 5; i++)
-        g->skill[i].id = i + 10000;
-
-    numdb_insert (guild_db, g->guild_id, g);
-
-    mapif_guild_created (fd, account_id, g);
-    mapif_guild_info (fd, g);
-
-    inter_log ("guild %s (id=%d) created by master %s (id=%d)\n",
-               name, g->guild_id, master->name, master->account_id);
-
-    return 0;
-}
-
-// ギルド情報要求
-static
-int mapif_parse_GuildInfo (int fd, int guild_id)
-{
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-    if (g != NULL)
-    {
-        guild_calcinfo (g);
-        mapif_guild_info (fd, g);
-    }
-    else
-        mapif_guild_noinfo (fd, guild_id);
-
-    return 0;
-}
-
-// ギルドメンバ追加要求
-static
-int mapif_parse_GuildAddMember (int fd, int guild_id, struct guild_member *m)
-{
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-    if (g == NULL)
-    {
-        mapif_guild_memberadded (fd, guild_id, m->account_id, 0 /*char_id*/, 1);
-        return 0;
-    }
-
-    for (int i = 0; i < g->max_member; i++)
-    {
-        if (g->member[i].account_id == 0)
-        {
-            memcpy (&g->member[i], m, sizeof (struct guild_member));
-            mapif_guild_memberadded (fd, guild_id, m->account_id, 0 /*char_id*/,
-                                     0);
-            guild_calcinfo (g);
-            mapif_guild_info (-1, g);
-
-            return 0;
-        }
-    }
-    mapif_guild_memberadded (fd, guild_id, m->account_id, 0 /*char_id*/, 1);
-
-    return 0;
-}
-
-// ギルド脱退/追放要求
-int mapif_parse_GuildLeave (int fd, int guild_id, int account_id, int char_id,
-                            int flag, const char *mes)
-{
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-    if (g != NULL)
-    {
-        for (int i = 0; i < MAX_GUILD; i++)
-        {
-            if (g->member[i].account_id == account_id)
-            {
-//              printf("%d %d\n", i, (int)(&g->member[i]));
-//              printf("%d %s\n", i, g->member[i].name);
-
-                if (flag)
-                {
-                    int j;
-                    // 追放の場合追放リストに入れる
-                    for (j = 0; j < MAX_GUILDEXPLUSION; j++)
-                    {
-                        if (g->explusion[j].account_id == 0)
-                            break;
-                    }
-                    if (j == MAX_GUILDEXPLUSION)
-                    {           // 一杯なので古いのを消す
-                        for (j = 0; j < MAX_GUILDEXPLUSION - 1; j++)
-                            g->explusion[j] = g->explusion[j + 1];
-                        j = MAX_GUILDEXPLUSION - 1;
-                    }
-                    g->explusion[j].account_id = account_id;
-                    memcpy (g->explusion[j].acc, "dummy", 24);
-                    memcpy (g->explusion[j].name, g->member[i].name, 24);
-                    memcpy (g->explusion[j].mes, mes, 40);
-                }
-
-                mapif_guild_leaved (guild_id, account_id, 0 /*char_id*/, flag,
-                                    g->member[i].name, mes);
-//              printf("%d %d\n", i, (int)(&g->member[i]));
-//              printf("%d %s\n", i, (&g->member[i])->name);
-                memset (&g->member[i], 0, sizeof (struct guild_member));
-
-                if (guild_check_empty (g) == 0)
-                    mapif_guild_info (-1, g);   // まだ人がいるのでデータ送信
-
-                return 0;
-            }
-        }
-    }
-    return 0;
-}
-
-// オンライン/Lv更新
-static
-int mapif_parse_GuildChangeMemberInfoShort (int fd, int guild_id,
-                                            int account_id, int char_id,
-                                            int online, int lv, int pc_class)
-{
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-    if (g == NULL)
-        return 0;
-
-    g->connect_member = 0;
-
-    int alv = 0;
-    int c = 0;
-    for (int i = 0; i < MAX_GUILD; i++)
-    {
-        if (g->member[i].account_id == account_id)
-        {
-            g->member[i].online = online;
-            g->member[i].lv = lv;
-            g->member[i].pc_class = pc_class;
-            mapif_guild_memberinfoshort (g, i);
-        }
-        if (g->member[i].account_id > 0)
-        {
-            alv += g->member[i].lv;
-            c++;
-        }
-        if (g->member[i].online)
-            g->connect_member++;
-    }
-    // 平均レベル
-    g->average_lv = alv / c;
-
-    return 0;
-}
-
-// ギルド解散処理用（同盟/敵対を解除）
-void guild_break_sub (db_key_t key, db_val_t data, va_list ap)
-{
-    struct guild *g = (struct guild *) data;
-    int  guild_id = va_arg (ap, int);
-    int  i;
-
-    for (i = 0; i < MAX_GUILDALLIANCE; i++)
-    {
-        if (g->alliance[i].guild_id == guild_id)
-            g->alliance[i].guild_id = 0;
-    }
-}
-
-// ギルド解散要求
-static
-int mapif_parse_BreakGuild (int fd, int guild_id)
-{
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-    if (g == NULL)
-        return 0;
-
-    numdb_foreach (guild_db, guild_break_sub, guild_id);
-    numdb_erase (guild_db, guild_id);
-    inter_guild_storage_delete (guild_id);
-    mapif_guild_broken (guild_id, 0);
-
-    inter_log ("guild %s (id=%d) broken\n", g->name, guild_id);
-    free (g);
-
-    return 0;
-}
-
-// ギルドメッセージ送信
-static
-int mapif_parse_GuildMessage (int fd, int guild_id, int account_id, const char *mes,
-                              int len)
-{
-    return mapif_guild_message (guild_id, account_id, mes, len);
-}
-
-// ギルド基本データ変更要求
-static
-int mapif_parse_GuildBasicInfoChange (int fd, int guild_id, int type,
-                                      const char *data, int len)
-{
-    short dw = *((short *) data);
-
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-    if (g == NULL)
-        return 0;
-
-    switch (type)
-    {
-        case GBI_GUILDLV:
-            if (dw > 0 && g->guild_lv + dw <= 50)
-            {
-                g->guild_lv += dw;
-                g->skill_point += dw;
-            }
-            else if (dw < 0 && g->guild_lv + dw >= 1)
-                g->guild_lv += dw;
-            mapif_guild_info (-1, g);
-            return 0;
-        default:
-            printf ("int_guild: GuildBasicInfoChange: Unknown type %d\n",
-                    type);
-            break;
-    }
-    mapif_guild_basicinfochanged (guild_id, type, data, len);
-
-    return 0;
-}
-
-// ギルドメンバデータ変更要求
-static
-int mapif_parse_GuildMemberInfoChange (int fd, int guild_id, int account_id,
-                                       int char_id, int type,
-                                       const char *data, int len)
-{
-    int  i;
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-    if (g == NULL)
-        return 0;
-
-    for (i = 0; i < g->max_member; i++)
-        if (g->member[i].account_id == account_id)
-            break;
-    if (i == g->max_member)
-    {
-        printf ("int_guild: GuildMemberChange: Not found %d,%d in %d[%s]\n",
-                account_id, char_id, guild_id, g->name);
-        return 0;
-    }
-    switch (type)
-    {
-        case GMI_POSITION:     // 役職
-            g->member[i].position = *((int *) data);
-            break;
-        case GMI_EXP:          // EXP
-        {
-            int  exp, oldexp = g->member[i].exp;
-            exp = g->member[i].exp = *((unsigned int *) data);
-            g->exp += (exp - oldexp);
-            guild_calcinfo (g); // Lvアップ判断
-            mapif_guild_basicinfochanged (guild_id, GBI_EXP, &g->exp, 4);
-        }
-            break;
-        default:
-            printf ("int_guild: GuildMemberInfoChange: Unknown type %d\n",
-                    type);
-            break;
-    }
-    mapif_guild_memberinfochanged (guild_id, account_id, char_id, type, data,
-                                   len);
-
-    return 0;
-}
-
-// ギルド役職名変更要求
-static
-int mapif_parse_GuildPosition (int fd, int guild_id, int idx,
-                               struct guild_position *p)
-{
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-
-    if (g == NULL || idx < 0 || idx >= MAX_GUILDPOSITION)
-    {
-        return 0;
-    }
-    memcpy (&g->position[idx], p, sizeof (struct guild_position));
-    mapif_guild_position (g, idx);
-    printf ("int_guild: position changed %d\n", idx);
-
-    return 0;
-}
-
-// ギルドスキルアップ要求
-static
-int mapif_parse_GuildSkillUp (int fd, int guild_id, int skill_num,
-                              int account_id)
-{
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-    int  idx = skill_num - 10000;
-
-    if (g == NULL || skill_num < 10000)
-        return 0;
-
-    if (g->skill_point > 0 && g->skill[idx].id > 0 && g->skill[idx].lv < 10)
-    {
-        g->skill[idx].lv++;
-        g->skill_point--;
-        if (guild_calcinfo (g) == 0)
-            mapif_guild_info (-1, g);
-        mapif_guild_skillupack (guild_id, skill_num, account_id);
-        printf ("int_guild: skill %d up\n", skill_num);
-    }
-
-    return 0;
-}
-
-// ギルド同盟要求
-static
-int mapif_parse_GuildAlliance (int fd, int guild_id1, int guild_id2,
-                               int account_id1, int account_id2, int flag)
-{
-    struct guild *g[2];
-    int  j, i;
-
-    g[0] = (struct guild *)numdb_search (guild_db, guild_id1);
-    g[1] = (struct guild *)numdb_search (guild_db, guild_id2);
-    if (g[0] == NULL || g[1] == NULL)
-        return 0;
-
-    if (!(flag & 0x8))
-    {
-        for (i = 0; i < 2 - (flag & 1); i++)
-        {
-            for (j = 0; j < MAX_GUILDALLIANCE; j++)
-                if (g[i]->alliance[j].guild_id == 0)
-                {
-                    g[i]->alliance[j].guild_id = g[1 - i]->guild_id;
-                    memcpy (g[i]->alliance[j].name, g[1 - i]->name, 24);
-                    g[i]->alliance[j].opposition = flag & 1;
-                    break;
-                }
-        }
-    }
-    else
-    {                           // 関係解消
-        for (i = 0; i < 2 - (flag & 1); i++)
-        {
-            for (j = 0; j < MAX_GUILDALLIANCE; j++)
-                if (g[i]->alliance[j].guild_id == g[1 - i]->guild_id
-                    && g[i]->alliance[j].opposition == (flag & 1))
-                {
-                    g[i]->alliance[j].guild_id = 0;
-                    break;
-                }
-        }
-    }
-    mapif_guild_alliance (guild_id1, guild_id2, account_id1, account_id2,
-                          flag, g[0]->name, g[1]->name);
-
-    return 0;
-}
-
-// ギルド告知変更要求
-static
-int mapif_parse_GuildNotice (int fd, int guild_id, const char *mes1,
-                             const char *mes2)
-{
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-    if (g == NULL)
-        return 0;
-    memcpy (g->mes1, mes1, 60);
-    memcpy (g->mes2, mes2, 120);
-
-    return mapif_guild_notice (g);
-}
-
-// ギルドエンブレム変更要求
-static
-int mapif_parse_GuildEmblem (int fd, int len, int guild_id, int dummy,
-                             const char *data)
-{
-    struct guild *g = (struct guild *)numdb_search (guild_db, guild_id);
-    if (g == NULL)
-        return 0;
-    memcpy (g->emblem_data, data, len);
-    g->emblem_len = len;
-    g->emblem_id++;
-
-    return mapif_guild_emblem (g);
-}
-
-static
-int mapif_parse_GuildCastleDataLoad (int fd, int castle_id, int index)
-{
-    struct guild_castle *gc = (struct guild_castle *)numdb_search (castle_db, castle_id);
-
-    if (gc == NULL)
-    {
-        return mapif_guild_castle_dataload (castle_id, 0, 0);
-    }
-    switch (index)
-    {
-        case 1:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->guild_id);
-        case 2:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->economy);
-        case 3:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->defense);
-        case 4:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->triggerE);
-        case 5:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->triggerD);
-        case 6:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->nextTime);
-        case 7:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->payTime);
-        case 8:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->createTime);
-        case 9:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->visibleC);
-        case 10:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->visibleG0);
-        case 11:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->visibleG1);
-        case 12:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->visibleG2);
-        case 13:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->visibleG3);
-        case 14:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->visibleG4);
-        case 15:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->visibleG5);
-        case 16:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->visibleG6);
-        case 17:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->visibleG7);
-        case 18:
-            return mapif_guild_castle_dataload (gc->castle_id, index, gc->Ghp0);    // guardian HP [Valaris]
-        case 19:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->Ghp1);
-        case 20:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->Ghp2);
-        case 21:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->Ghp3);
-        case 22:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->Ghp4);
-        case 23:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->Ghp5);
-        case 24:
-            return mapif_guild_castle_dataload (gc->castle_id, index,
-                                                gc->Ghp6);
-        case 25:
-            return mapif_guild_castle_dataload (gc->castle_id, index, gc->Ghp7);    // end additions [Valaris]
-
-        default:
-            printf
-                ("mapif_parse_GuildCastleDataLoad ERROR!! (Not found index=%d)\n",
-                 index);
-            return 0;
-    }
-
-    return 0;
-}
-
-static
-int mapif_parse_GuildCastleDataSave (int fd, int castle_id, int index,
-                                     int value)
-{
-    struct guild_castle *gc = (struct guild_castle *)numdb_search (castle_db, castle_id);
-
-    if (gc == NULL)
-    {
-        return mapif_guild_castle_datasave (castle_id, index, value);
-    }
-    switch (index)
-    {
-        case 1:
-            if (gc->guild_id != value)
-            {
-                int  gid = (value) ? value : gc->guild_id;
-                struct guild *g = (struct guild *)numdb_search (guild_db, gid);
-                inter_log ("guild %s (id=%d) %s castle id=%d\n",
-                           (g) ? g->name : "??", gid,
-                           (value) ? "occupy" : "abandon", index);
-            }
-            gc->guild_id = value;
-            break;
-        case 2:
-            gc->economy = value;
-            break;
-        case 3:
-            gc->defense = value;
-            break;
-        case 4:
-            gc->triggerE = value;
-            break;
-        case 5:
-            gc->triggerD = value;
-            break;
-        case 6:
-            gc->nextTime = value;
-            break;
-        case 7:
-            gc->payTime = value;
-            break;
-        case 8:
-            gc->createTime = value;
-            break;
-        case 9:
-            gc->visibleC = value;
-            break;
-        case 10:
-            gc->visibleG0 = value;
-            break;
-        case 11:
-            gc->visibleG1 = value;
-            break;
-        case 12:
-            gc->visibleG2 = value;
-            break;
-        case 13:
-            gc->visibleG3 = value;
-            break;
-        case 14:
-            gc->visibleG4 = value;
-            break;
-        case 15:
-            gc->visibleG5 = value;
-            break;
-        case 16:
-            gc->visibleG6 = value;
-            break;
-        case 17:
-            gc->visibleG7 = value;
-            break;
-        case 18:
-            gc->Ghp0 = value;
-            break;              // guardian HP [Valaris]
-        case 19:
-            gc->Ghp1 = value;
-            break;
-        case 20:
-            gc->Ghp2 = value;
-            break;
-        case 21:
-            gc->Ghp3 = value;
-            break;
-        case 22:
-            gc->Ghp4 = value;
-            break;
-        case 23:
-            gc->Ghp5 = value;
-            break;
-        case 24:
-            gc->Ghp6 = value;
-            break;
-        case 25:
-            gc->Ghp7 = value;
-            break;              // end additions [Valaris]
-        default:
-            printf
-                ("mapif_parse_GuildCastleDataSave ERROR!! (Not found index=%d)\n",
-                 index);
-            return 0;
-    }
-
-    return mapif_guild_castle_datasave (gc->castle_id, index, value);
-}
-
-// ギルドチェック要求
-static
-int mapif_parse_GuildCheck (int fd, int guild_id, int account_id, int char_id)
-{
-    return guild_check_conflict (guild_id, account_id, 0 /*char_id*/);
-}
-
-// map server からの通信
-// ・１パケットのみ解析すること
-// ・パケット長データはinter.cにセットしておくこと
-// ・パケット長チェックや、RFIFOSKIPは呼び出し元で行われるので行ってはならない
-// ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない
-int inter_guild_parse_frommap (int fd)
-{
-    switch (RFIFOW (fd, 0))
-    {
-        case 0x3030:
-            mapif_parse_CreateGuild (fd, RFIFOL (fd, 4), (const char *)RFIFOP (fd, 8),
-                                     (struct guild_member *) RFIFOP (fd, 32));
-            break;
-        case 0x3031:
-            mapif_parse_GuildInfo (fd, RFIFOL (fd, 2));
-            break;
-        case 0x3032:
-            mapif_parse_GuildAddMember (fd, RFIFOL (fd, 4),
-                                        (struct guild_member *) RFIFOP (fd,
-                                                                        8));
-            break;
-        case 0x3034:
-            mapif_parse_GuildLeave (fd, RFIFOL (fd, 2), RFIFOL (fd, 6),
-                                    RFIFOL (fd, 10), RFIFOB (fd, 14),
-                                    (const char *)RFIFOP (fd, 15));
-            break;
-        case 0x3035:
-            mapif_parse_GuildChangeMemberInfoShort (fd, RFIFOL (fd, 2),
-                                                    RFIFOL (fd, 6),
-                                                    RFIFOL (fd, 10),
-                                                    RFIFOB (fd, 14),
-                                                    RFIFOW (fd, 15),
-                                                    RFIFOW (fd, 17));
-            break;
-        case 0x3036:
-            mapif_parse_BreakGuild (fd, RFIFOL (fd, 2));
-            break;
-        case 0x3037:
-            mapif_parse_GuildMessage (fd, RFIFOL (fd, 4), RFIFOL (fd, 8),
-                                      (const char *)RFIFOP (fd, 12), RFIFOW (fd, 2) - 12);
-            break;
-        case 0x3038:
-            mapif_parse_GuildCheck (fd, RFIFOL (fd, 2), RFIFOL (fd, 6),
-                                    RFIFOL (fd, 10));
-            break;
-        case 0x3039:
-            mapif_parse_GuildBasicInfoChange (fd, RFIFOL (fd, 4),
-                                              RFIFOW (fd, 8), (const char *)RFIFOP (fd, 10),
-                                              RFIFOW (fd, 2) - 10);
-            break;
-        case 0x303A:
-            mapif_parse_GuildMemberInfoChange (fd, RFIFOL (fd, 4),
-                                               RFIFOL (fd, 8), RFIFOL (fd,
-                                                                       12),
-                                               RFIFOW (fd, 16), (const char *)RFIFOP (fd,
-                                                                        18),
-                                               RFIFOW (fd, 2) - 18);
-            break;
-        case 0x303B:
-            mapif_parse_GuildPosition (fd, RFIFOL (fd, 4), RFIFOL (fd, 8),
-                                       (struct guild_position *) RFIFOP (fd,
-                                                                         12));
-            break;
-        case 0x303C:
-            mapif_parse_GuildSkillUp (fd, RFIFOL (fd, 2), RFIFOL (fd, 6),
-                                      RFIFOL (fd, 10));
-            break;
-        case 0x303D:
-            mapif_parse_GuildAlliance (fd, RFIFOL (fd, 2), RFIFOL (fd, 6),
-                                       RFIFOL (fd, 10), RFIFOL (fd, 14),
-                                       RFIFOB (fd, 18));
-            break;
-        case 0x303E:
-            mapif_parse_GuildNotice (fd, RFIFOL (fd, 2), (const char *)RFIFOP (fd, 6),
-                                     (const char *)RFIFOP (fd, 66));
-            break;
-        case 0x303F:
-            mapif_parse_GuildEmblem (fd, RFIFOW (fd, 2) - 12, RFIFOL (fd, 4),
-                                     RFIFOL (fd, 8), (const char *)RFIFOP (fd, 12));
-            break;
-        case 0x3040:
-            mapif_parse_GuildCastleDataLoad (fd, RFIFOW (fd, 2),
-                                             RFIFOB (fd, 4));
-            break;
-        case 0x3041:
-            mapif_parse_GuildCastleDataSave (fd, RFIFOW (fd, 2),
-                                             RFIFOB (fd, 4), RFIFOL (fd, 5));
-            break;
-
-        default:
-            return 0;
-    }
-
-    return 1;
-}
-
-// マップサーバーの接続時処理
-int inter_guild_mapif_init (int fd)
-{
-    return mapif_guild_castle_alldataload (fd);
-}
-
-// サーバーから脱退要求（キャラ削除用）
-int inter_guild_leave (int guild_id, int account_id, int char_id)
-{
-    return mapif_parse_GuildLeave (-1, guild_id, account_id, 0 /*char_id*/, 0,
-                                   "**サーバー命令**");
-}
diff --git a/src/char/int_guild.hpp b/src/char/int_guild.hpp
deleted file mode 100644
index 2833e2d..0000000
--- a/src/char/int_guild.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id: int_guild.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef INT_GUILD_HPP
-#define INT_GUILD_HPP
-
-int  inter_guild_init (void);
-int  inter_guild_save (void);
-int  inter_guild_parse_frommap (int fd);
-struct guild *inter_guild_search (int guild_id);
-int  inter_guild_mapif_init (int fd);
-
-int  inter_guild_leave (int guild_id, int account_id, int char_id);
-
-extern char guild_txt[1024];
-extern char castle_txt[1024];
-
-#endif
diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp
index a962b92..8aa615f 100644
--- a/src/char/int_storage.cpp
+++ b/src/char/int_storage.cpp
@@ -10,15 +10,12 @@
 #include "char.hpp"
 #include "inter.hpp"
 #include "int_storage.hpp"
-#include "int_guild.hpp"
 
 // ファイル名のデフォルト
 // inter_config_read()で再設定される
 char storage_txt[1024] = "save/storage.txt";
-char guild_storage_txt[1024] = "save/g_storage.txt";
 
 static struct dbt *storage_db;
-static struct dbt *guild_storage_db;
 
 // 倉庫データを文字列に変換
 static
@@ -120,104 +117,6 @@ int storage_fromstr (char *str, struct storage *p)
     return 0;
 }
 
-static
-int guild_storage_tostr (char *str, struct guild_storage *p)
-{
-    int  i, f = 0;
-    char *str_p = str;
-    str_p += sprintf (str, "%d,%d\t", p->guild_id, p->storage_amount);
-
-    for (i = 0; i < MAX_GUILD_STORAGE; i++)
-        if ((p->storage_[i].nameid) && (p->storage_[i].amount))
-        {
-            str_p += sprintf (str_p, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ",
-                              p->storage_[i].id, p->storage_[i].nameid,
-                              p->storage_[i].amount, p->storage_[i].equip,
-                              p->storage_[i].identify, p->storage_[i].refine,
-                              p->storage_[i].attribute,
-                              p->storage_[i].card[0], p->storage_[i].card[1],
-                              p->storage_[i].card[2], p->storage_[i].card[3]);
-            f++;
-        }
-
-    *(str_p++) = '\t';
-
-    *str_p = '\0';
-    if (!f)
-        str[0] = 0;
-    return 0;
-}
-
-static
-int guild_storage_fromstr (char *str, struct guild_storage *p)
-{
-    int  tmp_int[256];
-    int  set, next, len, i;
-
-    set = sscanf (str, "%d,%d%n", &tmp_int[0], &tmp_int[1], &next);
-    p->storage_amount = tmp_int[1];
-
-    if (set != 2)
-        return 1;
-    if (str[next] == '\n' || str[next] == '\r')
-        return 0;
-    next++;
-    for (i = 0; str[next] && str[next] != '\t' && i < MAX_GUILD_STORAGE; i++)
-    {
-        if (sscanf (str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n",
-                    &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-                    &tmp_int[4], &tmp_int[5], &tmp_int[6],
-                    &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10],
-                    &tmp_int[10], &len) == 12)
-        {
-            p->storage_[i].id = tmp_int[0];
-            p->storage_[i].nameid = tmp_int[1];
-            p->storage_[i].amount = tmp_int[2];
-            p->storage_[i].equip = tmp_int[3];
-            p->storage_[i].identify = tmp_int[4];
-            p->storage_[i].refine = tmp_int[5];
-            p->storage_[i].attribute = tmp_int[6];
-            p->storage_[i].card[0] = tmp_int[7];
-            p->storage_[i].card[1] = tmp_int[8];
-            p->storage_[i].card[2] = tmp_int[9];
-            p->storage_[i].card[3] = tmp_int[10];
-            next += len;
-            if (str[next] == ' ')
-                next++;
-        }
-
-        else if (sscanf (str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n",
-                         &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-                         &tmp_int[4], &tmp_int[5], &tmp_int[6],
-                         &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10],
-                         &len) == 11)
-        {
-            p->storage_[i].id = tmp_int[0];
-            p->storage_[i].nameid = tmp_int[1];
-            p->storage_[i].amount = tmp_int[2];
-            p->storage_[i].equip = tmp_int[3];
-            p->storage_[i].identify = tmp_int[4];
-            p->storage_[i].refine = tmp_int[5];
-            p->storage_[i].attribute = tmp_int[6];
-            p->storage_[i].card[0] = tmp_int[7];
-            p->storage_[i].card[1] = tmp_int[8];
-            p->storage_[i].card[2] = tmp_int[9];
-            p->storage_[i].card[3] = tmp_int[10];
-            next += len;
-            if (str[next] == ' ')
-                next++;
-        }
-
-        else
-            return 1;
-    }
-    if (i >= MAX_GUILD_STORAGE && str[next] && str[next] != '\t')
-        printf
-            ("guild_storage_fromstr: Found a storage line with more items than MAX_GUILD_STORAGE (%d), remaining items have been discarded!\n",
-             MAX_GUILD_STORAGE);
-    return 0;
-}
-
 // アカウントから倉庫データインデックスを得る（新規倉庫追加可能）
 struct storage *account2storage (int account_id)
 {
@@ -233,24 +132,6 @@ struct storage *account2storage (int account_id)
     return s;
 }
 
-static
-struct guild_storage *guild2storage (int guild_id)
-{
-    struct guild_storage *gs = NULL;
-    if (inter_guild_search (guild_id) != NULL)
-    {
-        gs = (struct guild_storage *) numdb_search (guild_storage_db,
-                                                    guild_id);
-        if (gs == NULL)
-        {
-            CREATE (gs, struct guild_storage, 1);
-            gs->guild_id = guild_id;
-            numdb_insert (guild_storage_db, gs->guild_id, gs);
-        }
-    }
-    return gs;
-}
-
 //---------------------------------------------------------
 // 倉庫データを読み込む
 int inter_storage_init (void)
@@ -258,7 +139,6 @@ int inter_storage_init (void)
     char line[65536];
     int  c = 0, tmp_int;
     struct storage *s;
-    struct guild_storage *gs;
     FILE *fp;
 
     storage_db = numdb_init ();
@@ -288,34 +168,6 @@ int inter_storage_init (void)
     }
     fclose_ (fp);
 
-    c = 0;
-    guild_storage_db = numdb_init ();
-
-    fp = fopen_ (guild_storage_txt, "r");
-    if (fp == NULL)
-    {
-        printf ("cant't read : %s\n", guild_storage_txt);
-        return 1;
-    }
-    while (fgets (line, 65535, fp))
-    {
-        sscanf (line, "%d", &tmp_int);
-        CREATE (gs, struct guild_storage, 1);
-        gs->guild_id = tmp_int;
-        if (gs->guild_id > 0 && guild_storage_fromstr (line, gs) == 0)
-        {
-            numdb_insert (guild_storage_db, gs->guild_id, gs);
-        }
-        else
-        {
-            printf ("int_storage: broken data [%s] line %d\n",
-                    guild_storage_txt, c);
-            free (gs);
-        }
-        c++;
-    }
-    fclose_ (fp);
-
     return 0;
 }
 
@@ -327,18 +179,9 @@ void storage_db_final (db_key_t k, db_val_t data, va_list ap)
         free (p);
 }
 
-static
-void guild_storage_db_final (db_key_t k, db_val_t data, va_list ap)
-{
-    struct guild_storage *p = (struct guild_storage *) data;
-    if (p)
-        free (p);
-}
-
 void inter_storage_final (void)
 {
     numdb_final (storage_db, storage_db_final);
-    numdb_final (guild_storage_db, guild_storage_db_final);
     return;
 }
 
@@ -375,44 +218,6 @@ int inter_storage_save (void)
     return 0;
 }
 
-static
-void inter_guild_storage_save_sub (db_key_t key, db_val_t data, va_list ap)
-{
-    char line[65536];
-    FILE *fp;
-
-    if (inter_guild_search (((struct guild_storage *) data)->guild_id) !=
-        NULL)
-    {
-        guild_storage_tostr (line, (struct guild_storage *) data);
-        fp = va_arg (ap, FILE *);
-        if (*line)
-            fprintf (fp, "%s\n", line);
-    }
-}
-
-//---------------------------------------------------------
-// 倉庫データを書き込む
-int inter_guild_storage_save (void)
-{
-    FILE *fp;
-    int  lock;
-
-    if (!guild_storage_db)
-        return 1;
-
-    if ((fp = lock_fopen (guild_storage_txt, &lock)) == NULL)
-    {
-        printf ("int_storage: cant write [%s] !!! data is lost !!!\n",
-                guild_storage_txt);
-        return 1;
-    }
-    numdb_foreach (guild_storage_db, inter_guild_storage_save_sub, fp);
-    lock_fclose (fp, guild_storage_txt, &lock);
-//  printf("int_storage: %s saved.\n",guild_storage_txt);
-    return 0;
-}
-
 // 倉庫データ削除
 int inter_storage_delete (int account_id)
 {
@@ -426,19 +231,6 @@ int inter_storage_delete (int account_id)
     return 0;
 }
 
-// ギルド倉庫データ削除
-int inter_guild_storage_delete (int guild_id)
-{
-    struct guild_storage *gs =
-        (struct guild_storage *) numdb_search (guild_storage_db, guild_id);
-    if (gs)
-    {
-        numdb_erase (guild_storage_db, guild_id);
-        free (gs);
-    }
-    return 0;
-}
-
 //---------------------------------------------------------
 // map serverへの通信
 
@@ -466,41 +258,6 @@ int mapif_save_storage_ack (int fd, int account_id)
     return 0;
 }
 
-static
-int mapif_load_guild_storage (int fd, int account_id, int guild_id)
-{
-    struct guild_storage *gs = guild2storage (guild_id);
-    WFIFOW (fd, 0) = 0x3818;
-    if (gs)
-    {
-        WFIFOW (fd, 2) = sizeof (struct guild_storage) + 12;
-        WFIFOL (fd, 4) = account_id;
-        WFIFOL (fd, 8) = guild_id;
-        memcpy (WFIFOP (fd, 12), gs, sizeof (struct guild_storage));
-    }
-    else
-    {
-        WFIFOW (fd, 2) = 12;
-        WFIFOL (fd, 4) = account_id;
-        WFIFOL (fd, 8) = 0;
-    }
-    WFIFOSET (fd, WFIFOW (fd, 2));
-
-    return 0;
-}
-
-static
-int mapif_save_guild_storage_ack (int fd, int account_id, int guild_id,
-                                  int fail)
-{
-    WFIFOW (fd, 0) = 0x3819;
-    WFIFOL (fd, 2) = account_id;
-    WFIFOL (fd, 6) = guild_id;
-    WFIFOB (fd, 10) = fail;
-    WFIFOSET (fd, 11);
-    return 0;
-}
-
 //---------------------------------------------------------
 // map serverからの通信
 
@@ -533,38 +290,6 @@ int mapif_parse_SaveStorage (int fd)
     return 0;
 }
 
-static
-int mapif_parse_LoadGuildStorage (int fd)
-{
-    mapif_load_guild_storage (fd, RFIFOL (fd, 2), RFIFOL (fd, 6));
-    return 0;
-}
-
-static
-int mapif_parse_SaveGuildStorage (int fd)
-{
-    struct guild_storage *gs;
-    int  guild_id = RFIFOL (fd, 8);
-    int  len = RFIFOW (fd, 2);
-    if (sizeof (struct guild_storage) != len - 12)
-    {
-        printf ("inter storage: data size error %d %d\n",
-                sizeof (struct guild_storage), len - 12);
-    }
-    else
-    {
-        gs = guild2storage (guild_id);
-        if (gs)
-        {
-            memcpy (gs, RFIFOP (fd, 12), sizeof (struct guild_storage));
-            mapif_save_guild_storage_ack (fd, RFIFOL (fd, 4), guild_id, 0);
-        }
-        else
-            mapif_save_guild_storage_ack (fd, RFIFOL (fd, 4), guild_id, 1);
-    }
-    return 0;
-}
-
 // map server からの通信
 // ・１パケットのみ解析すること
 // ・パケット長データはinter.cにセットしておくこと
@@ -580,12 +305,6 @@ int inter_storage_parse_frommap (int fd)
         case 0x3011:
             mapif_parse_SaveStorage (fd);
             break;
-        case 0x3018:
-            mapif_parse_LoadGuildStorage (fd);
-            break;
-        case 0x3019:
-            mapif_parse_SaveGuildStorage (fd);
-            break;
         default:
             return 0;
     }
diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp
index 9986f2d..591777d 100644
--- a/src/char/int_storage.hpp
+++ b/src/char/int_storage.hpp
@@ -5,14 +5,11 @@
 int  inter_storage_init (void);
 void inter_storage_final (void);
 int  inter_storage_save (void);
-int  inter_guild_storage_save (void);
 int  inter_storage_delete (int account_id);
-int  inter_guild_storage_delete (int guild_id);
 struct storage *account2storage (int account_id);
 
 int  inter_storage_parse_frommap (int fd);
 
 extern char storage_txt[1024];
-extern char guild_storage_txt[1024];
 
 #endif
diff --git a/src/char/inter.cpp b/src/char/inter.cpp
index 7752cb4..d5dee6c 100644
--- a/src/char/inter.cpp
+++ b/src/char/inter.cpp
@@ -9,7 +9,6 @@
 
 #include "inter.hpp"
 #include "int_party.hpp"
-#include "int_guild.hpp"
 #include "int_storage.hpp"
 #include "../common/lock.hpp"
 
@@ -213,22 +212,10 @@ int inter_config_read (const char *cfgName)
         {
             strncpy (party_txt, w2, sizeof (party_txt));
         }
-        else if (strcasecmp (w1, "guild_txt") == 0)
-        {
-            strncpy (guild_txt, w2, sizeof (guild_txt));
-        }
-        else if (strcasecmp (w1, "castle_txt") == 0)
-        {
-            strncpy (castle_txt, w2, sizeof (castle_txt));
-        }
         else if (strcasecmp (w1, "accreg_txt") == 0)
         {
             strncpy (accreg_txt, w2, sizeof (accreg_txt));
         }
-        else if (strcasecmp (w1, "guild_storage_txt") == 0)
-        {
-            strncpy (guild_storage_txt, w2, sizeof (guild_storage_txt));
-        }
         else if (strcasecmp (w1, "party_share_level") == 0)
         {
             party_share_level = atoi (w2);
@@ -271,9 +258,7 @@ int inter_log (const char *fmt, ...)
 int inter_save (void)
 {
     inter_party_save ();
-    inter_guild_save ();
     inter_storage_save ();
-    inter_guild_storage_save ();
     inter_accreg_save ();
 
     return 0;
@@ -287,21 +272,12 @@ int inter_init (const char *file)
     wis_db = numdb_init ();
 
     inter_party_init ();
-    inter_guild_init ();
     inter_storage_init ();
     inter_accreg_init ();
 
     return 0;
 }
 
-// マップサーバー接続
-int inter_mapif_init (int fd)
-{
-    inter_guild_mapif_init (fd);
-
-    return 0;
-}
-
 //--------------------------------------------------------
 // sended packets to map-server
 
@@ -625,8 +601,6 @@ int inter_parse_frommap (int fd)
         default:
             if (inter_party_parse_frommap (fd))
                 break;
-            if (inter_guild_parse_frommap (fd))
-                break;
             if (inter_storage_parse_frommap (fd))
                 break;
             return 0;
diff --git a/src/char/inter.hpp b/src/char/inter.hpp
index 56960be..f27b571 100644
--- a/src/char/inter.hpp
+++ b/src/char/inter.hpp
@@ -5,7 +5,6 @@
 int  inter_init (const char *file);
 int  inter_save (void);
 int  inter_parse_frommap (int fd);
-int  inter_mapif_init (int fd);
 
 int  inter_check_length (int fd, int length);