Purge some unused functions

1 files changed, 9 insertions, 205 deletions

diff --git a/src/map/chat.cpp b/src/map/chat.cpp
index 89ee992..b9c8dfe 100644
--- a/src/map/chat.cpp
+++ b/src/map/chat.cpp
@@ -12,90 +12,10 @@
 #include "npc.hpp"
 #include "pc.hpp"
 
+static
 int chat_triggerevent(struct chat_data *cd);
-
-/*==========================================
- * チャットルーム作成
- *------------------------------------------
- */
-int chat_createchat(struct map_session_data *sd, int limit, int pub,
-                     const char *pass, const char *title, int titlelen)
-{
-    struct chat_data *cd;
-
-    nullpo_retr(0, sd);
-
-    CREATE(cd, struct chat_data, 1);
-
-    cd->limit = limit;
-    cd->pub = pub;
-    cd->users = 1;
-    memcpy(cd->pass, pass, 8);
-    if (titlelen >= sizeof(cd->title) - 1)
-        titlelen = sizeof(cd->title) - 1;
-    memcpy(cd->title, title, titlelen);
-    cd->title[titlelen] = 0;
-
-    cd->owner = (struct block_list **)(&cd->usersd[0]);
-    cd->usersd[0] = sd;
-    cd->bl.m = sd->bl.m;
-    cd->bl.x = sd->bl.x;
-    cd->bl.y = sd->bl.y;
-    cd->bl.type = BL_CHAT;
-
-    cd->bl.id = map_addobject(&cd->bl);
-    if (cd->bl.id == 0)
-    {
-        clif_createchat(sd, 1);
-        free(cd);
-        return 0;
-    }
-    pc_setchatid(sd, cd->bl.id);
-
-    clif_createchat(sd, 0);
-    clif_dispchat(cd, 0);
-
-    return 0;
-}
-
-/*==========================================
- * 既存チャットルームに参加
- *------------------------------------------
- */
-int chat_joinchat(struct map_session_data *sd, int chatid, const char *pass)
-{
-    struct chat_data *cd;
-
-    nullpo_retr(0, sd);
-
-    cd = (struct chat_data *) map_id2bl(chatid);
-    if (cd == NULL)
-        return 1;
-
-    if (cd->bl.m != sd->bl.m || cd->limit <= cd->users)
-    {
-        clif_joinchatfail(sd, 0);
-        return 0;
-    }
-    if (cd->pub == 0 && strncmp(pass, cd->pass, 8))
-    {
-        clif_joinchatfail(sd, 1);
-        return 0;
-    }
-
-    cd->usersd[cd->users] = sd;
-    cd->users++;
-
-    pc_setchatid(sd, cd->bl.id);
-
-    clif_joinchatok(sd, cd);   // 新たに参加した人には全員のリスト
-    clif_addchat(cd, sd);      // 既に中に居た人には追加した人の報告
-    clif_dispchat(cd, 0);      // 周囲の人には人数変化報告
-
-    chat_triggerevent(cd);     // イベント
-
-    return 0;
-}
+static
+int chat_npckickall(struct chat_data *cd);
 
 /*==========================================
  * チャットルームから抜ける
@@ -159,113 +79,6 @@ int chat_leavechat(struct map_session_data *sd)
 }
 
 /*==========================================
- * チャットルームの持ち主を譲る
- *------------------------------------------
- */
-int chat_changechatowner(struct map_session_data *sd, const char *nextownername)
-{
-    struct chat_data *cd;
-    struct map_session_data *tmp_sd;
-    int i, nextowner;
-
-    nullpo_retr(1, sd);
-
-    cd = (struct chat_data *) map_id2bl(sd->chatID);
-    if (cd == NULL || (struct block_list *) sd != (*cd->owner))
-        return 1;
-
-    for (i = 1, nextowner = -1; i < cd->users; i++)
-    {
-        if (strcmp(cd->usersd[i]->status.name, nextownername) == 0)
-        {
-            nextowner = i;
-            break;
-        }
-    }
-    if (nextowner < 0)          // そんな人は居ない
-        return -1;
-
-    clif_changechatowner(cd, cd->usersd[nextowner]);
-    // 一旦消す
-    clif_clearchat(cd, 0);
-
-    // userlistの順番変更 (0が所有者なので)
-    if ((tmp_sd = cd->usersd[0]) == NULL)
-        return 1;               //ありえるのかな？
-    cd->usersd[0] = cd->usersd[nextowner];
-    cd->usersd[nextowner] = tmp_sd;
-
-    // 新しい所有者の位置へ変更
-    cd->bl.x = cd->usersd[0]->bl.x;
-    cd->bl.y = cd->usersd[0]->bl.y;
-
-    // 再度表示
-    clif_dispchat(cd, 0);
-
-    return 0;
-}
-
-/*==========================================
- * チャットの状態(タイトル等)を変更
- *------------------------------------------
- */
-int chat_changechatstatus(struct map_session_data *sd, int limit, int pub,
-                           const char *pass, const char *title, int titlelen)
-{
-    struct chat_data *cd;
-
-    nullpo_retr(1, sd);
-
-    cd = (struct chat_data *) map_id2bl(sd->chatID);
-    if (cd == NULL || (struct block_list *) sd != (*cd->owner))
-        return 1;
-
-    cd->limit = limit;
-    cd->pub = pub;
-    memcpy(cd->pass, pass, 8);
-    if (titlelen >= sizeof(cd->title) - 1)
-        titlelen = sizeof(cd->title) - 1;
-    memcpy(cd->title, title, titlelen);
-    cd->title[titlelen] = 0;
-
-    clif_changechatstatus(cd);
-    clif_dispchat(cd, 0);
-
-    return 0;
-}
-
-/*==========================================
- * チャットルームから蹴り出す
- *------------------------------------------
- */
-int chat_kickchat(struct map_session_data *sd, const char *kickusername)
-{
-    struct chat_data *cd;
-    int i, kickuser;
-
-    nullpo_retr(1, sd);
-
-    cd = (struct chat_data *) map_id2bl(sd->chatID);
-    if (cd == NULL || (struct block_list *) sd != (*cd->owner))
-        return 1;
-
-    for (i = 0, kickuser = -1; i < cd->users; i++)
-    {
-        if (strcmp(cd->usersd[i]->status.name, kickusername) == 0)
-        {
-            kickuser = i;
-            break;
-        }
-    }
-    if (kickuser < 0)           // そんな人は居ない
-        return -1;
-
-    chat_leavechat(cd->usersd[kickuser]);
-
-    return 0;
-}
-
-/*==========================================
  * npcチャットルーム作成
  *------------------------------------------
  */
@@ -318,8 +131,8 @@ int chat_deletenpcchat(struct npc_data *nd)
 {
     struct chat_data *cd;
 
-    nullpo_retr(0, nd);
-    nullpo_retr(0, cd = (struct chat_data *) map_id2bl(nd->chat_id));
+    nullpo_ret(nd);
+    nullpo_ret(cd = (struct chat_data *) map_id2bl(nd->chat_id));
 
     chat_npckickall(cd);
     clif_clearchat(cd, 0);
@@ -335,7 +148,7 @@ int chat_deletenpcchat(struct npc_data *nd)
  */
 int chat_triggerevent(struct chat_data *cd)
 {
-    nullpo_retr(0, cd);
+    nullpo_ret(cd);
 
     if (cd->users >= cd->trigger && cd->npc_event[0])
         npc_event_do(cd->npc_event);
@@ -348,7 +161,7 @@ int chat_triggerevent(struct chat_data *cd)
  */
 int chat_enableevent(struct chat_data *cd)
 {
-    nullpo_retr(0, cd);
+    nullpo_ret(cd);
 
     cd->trigger &= 0x7f;
     chat_triggerevent(cd);
@@ -361,7 +174,7 @@ int chat_enableevent(struct chat_data *cd)
  */
 int chat_disableevent(struct chat_data *cd)
 {
-    nullpo_retr(0, cd);
+    nullpo_ret(cd);
 
     cd->trigger |= 0x80;
     return 0;
@@ -373,7 +186,7 @@ int chat_disableevent(struct chat_data *cd)
  */
 int chat_npckickall(struct chat_data *cd)
 {
-    nullpo_retr(0, cd);
+    nullpo_ret(cd);
 
     while (cd->users > 0)
     {
@@ -381,12 +194,3 @@ int chat_npckickall(struct chat_data *cd)
     }
     return 0;
 }
-
-/*==========================================
- * 終了
- *------------------------------------------
- */
-int do_final_chat(void)
-{
-    return 0;
-}