diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-13 16:25:50 -0800 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-14 16:18:22 -0800 |
commit | 069f39e8a1ebee3e4a4ce8302d0099842876782b (patch) | |
tree | 57d8de5f57d65878f8ef560e2884b9dee08e9323 /src/map/chat.cpp | |
parent | f9563edf69f083287630f4b17db70d97524196d6 (diff) | |
download | tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.gz tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.bz2 tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.xz tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.zip |
Some formatting fixes before I go insane
Also delete the French translation from ladmin.
Diffstat (limited to 'src/map/chat.cpp')
-rw-r--r-- | src/map/chat.cpp | 176 |
1 files changed, 88 insertions, 88 deletions
diff --git a/src/map/chat.cpp b/src/map/chat.cpp index cb274f8..9078ea0 100644 --- a/src/map/chat.cpp +++ b/src/map/chat.cpp @@ -15,48 +15,48 @@ #include "memwatch.hpp" #endif -int chat_triggerevent (struct chat_data *cd); +int chat_triggerevent(struct chat_data *cd); /*========================================== * チャットルーム作成 *------------------------------------------ */ -int chat_createchat (struct map_session_data *sd, int limit, int pub, +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); + 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); + 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->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); + cd->bl.id = map_addobject(&cd->bl); if (cd->bl.id == 0) { - clif_createchat (sd, 1); - free (cd); + clif_createchat(sd, 1); + free(cd); return 0; } - pc_setchatid (sd, cd->bl.id); + pc_setchatid(sd, cd->bl.id); - clif_createchat (sd, 0); - clif_dispchat (cd, 0); + clif_createchat(sd, 0); + clif_dispchat(cd, 0); return 0; } @@ -65,37 +65,37 @@ int chat_createchat (struct map_session_data *sd, int limit, int pub, * 既存チャットルームに参加 *------------------------------------------ */ -int chat_joinchat (struct map_session_data *sd, int chatid, const char *pass) +int chat_joinchat(struct map_session_data *sd, int chatid, const char *pass) { struct chat_data *cd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - cd = (struct chat_data *) map_id2bl (chatid); + 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); + clif_joinchatfail(sd, 0); return 0; } - if (cd->pub == 0 && strncmp (pass, cd->pass, 8)) + if (cd->pub == 0 && strncmp(pass, cd->pass, 8)) { - clif_joinchatfail (sd, 1); + clif_joinchatfail(sd, 1); return 0; } cd->usersd[cd->users] = sd; cd->users++; - pc_setchatid (sd, cd->bl.id); + pc_setchatid(sd, cd->bl.id); - clif_joinchatok (sd, cd); // 新たに参加した人には全員のリスト - clif_addchat (cd, sd); // 既に中に居た人には追加した人の報告 - clif_dispchat (cd, 0); // 周囲の人には人数変化報告 + clif_joinchatok(sd, cd); // 新たに参加した人には全員のリスト + clif_addchat(cd, sd); // 既に中に居た人には追加した人の報告 + clif_dispchat(cd, 0); // 周囲の人には人数変化報告 - chat_triggerevent (cd); // イベント + chat_triggerevent(cd); // イベント return 0; } @@ -104,14 +104,14 @@ int chat_joinchat (struct map_session_data *sd, int chatid, const char *pass) * チャットルームから抜ける *------------------------------------------ */ -int chat_leavechat (struct map_session_data *sd) +int chat_leavechat(struct map_session_data *sd) { struct chat_data *cd; - int i, leavechar; + int i, leavechar; - nullpo_retr (1, sd); + nullpo_retr(1, sd); - cd = (struct chat_data *) map_id2bl (sd->chatID); + cd = (struct chat_data *) map_id2bl(sd->chatID); if (cd == NULL) return 1; @@ -129,21 +129,21 @@ int chat_leavechat (struct map_session_data *sd) if (leavechar == 0 && cd->users > 1 && (*cd->owner)->type == BL_PC) { // 所有者だった&他に人が居る&PCのチャット - clif_changechatowner (cd, cd->usersd[1]); - clif_clearchat (cd, 0); + clif_changechatowner(cd, cd->usersd[1]); + clif_clearchat(cd, 0); } // 抜けるPCにも送るのでusersを減らす前に実行 - clif_leavechat (cd, sd); + clif_leavechat(cd, sd); cd->users--; - pc_setchatid (sd, 0); + pc_setchatid(sd, 0); if (cd->users == 0 && (*cd->owner)->type == BL_PC) { // 全員居なくなった&PCのチャットなので消す - clif_clearchat (cd, 0); - map_delobject (cd->bl.id, BL_CHAT); // freeまでしてくれる + clif_clearchat(cd, 0); + map_delobject(cd->bl.id, BL_CHAT); // freeまでしてくれる } else { @@ -155,7 +155,7 @@ int chat_leavechat (struct map_session_data *sd) cd->bl.x = cd->usersd[0]->bl.x; cd->bl.y = cd->usersd[0]->bl.y; } - clif_dispchat (cd, 0); + clif_dispchat(cd, 0); } return 0; @@ -165,21 +165,21 @@ int chat_leavechat (struct map_session_data *sd) * チャットルームの持ち主を譲る *------------------------------------------ */ -int chat_changechatowner (struct map_session_data *sd, const char *nextownername) +int chat_changechatowner(struct map_session_data *sd, const char *nextownername) { struct chat_data *cd; struct map_session_data *tmp_sd; - int i, nextowner; + int i, nextowner; - nullpo_retr (1, sd); + nullpo_retr(1, sd); - cd = (struct chat_data *) map_id2bl (sd->chatID); + 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) + if (strcmp(cd->usersd[i]->status.name, nextownername) == 0) { nextowner = i; break; @@ -188,9 +188,9 @@ int chat_changechatowner (struct map_session_data *sd, const char *nextownername if (nextowner < 0) // そんな人は居ない return -1; - clif_changechatowner (cd, cd->usersd[nextowner]); + clif_changechatowner(cd, cd->usersd[nextowner]); // 一旦消す - clif_clearchat (cd, 0); + clif_clearchat(cd, 0); // userlistの順番変更 (0が所有者なので) if ((tmp_sd = cd->usersd[0]) == NULL) @@ -203,7 +203,7 @@ int chat_changechatowner (struct map_session_data *sd, const char *nextownername cd->bl.y = cd->usersd[0]->bl.y; // 再度表示 - clif_dispchat (cd, 0); + clif_dispchat(cd, 0); return 0; } @@ -212,27 +212,27 @@ int chat_changechatowner (struct map_session_data *sd, const char *nextownername * チャットの状態(タイトル等)を変更 *------------------------------------------ */ -int chat_changechatstatus (struct map_session_data *sd, int limit, int pub, +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); + nullpo_retr(1, sd); - cd = (struct chat_data *) map_id2bl (sd->chatID); + 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); + 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); + clif_changechatstatus(cd); + clif_dispchat(cd, 0); return 0; } @@ -241,20 +241,20 @@ int chat_changechatstatus (struct map_session_data *sd, int limit, int pub, * チャットルームから蹴り出す *------------------------------------------ */ -int chat_kickchat (struct map_session_data *sd, const char *kickusername) +int chat_kickchat(struct map_session_data *sd, const char *kickusername) { struct chat_data *cd; - int i, kickuser; + int i, kickuser; - nullpo_retr (1, sd); + nullpo_retr(1, sd); - cd = (struct chat_data *) map_id2bl (sd->chatID); + 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) + if (strcmp(cd->usersd[i]->status.name, kickusername) == 0) { kickuser = i; break; @@ -263,7 +263,7 @@ int chat_kickchat (struct map_session_data *sd, const char *kickusername) if (kickuser < 0) // そんな人は居ない return -1; - chat_leavechat (cd->usersd[kickuser]); + chat_leavechat(cd->usersd[kickuser]); return 0; } @@ -272,24 +272,24 @@ int chat_kickchat (struct map_session_data *sd, const char *kickusername) * npcチャットルーム作成 *------------------------------------------ */ -int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger, +int chat_createnpcchat(struct npc_data *nd, int limit, int pub, int trigger, const char *title, int titlelen, const char *ev) { struct chat_data *cd; - nullpo_retr (1, nd); + nullpo_retr(1, nd); - CREATE (cd, struct chat_data, 1); + CREATE(cd, struct chat_data, 1); cd->limit = cd->trigger = limit; if (trigger > 0) cd->trigger = trigger; cd->pub = pub; cd->users = 0; - memcpy (cd->pass, "", 8); - if (titlelen >= sizeof (cd->title) - 1) - titlelen = sizeof (cd->title) - 1; - memcpy (cd->title, title, titlelen); + memcpy(cd->pass, "", 8); + if (titlelen >= sizeof(cd->title) - 1) + titlelen = sizeof(cd->title) - 1; + memcpy(cd->title, title, titlelen); cd->title[titlelen] = 0; cd->bl.m = nd->bl.m; @@ -298,17 +298,17 @@ int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger, cd->bl.type = BL_CHAT; cd->owner_ = (struct block_list *) nd; cd->owner = &cd->owner_; - memcpy (cd->npc_event, ev, sizeof (cd->npc_event)); + memcpy(cd->npc_event, ev, sizeof(cd->npc_event)); - cd->bl.id = map_addobject (&cd->bl); + cd->bl.id = map_addobject(&cd->bl); if (cd->bl.id == 0) { - free (cd); + free(cd); return 0; } nd->chat_id = cd->bl.id; - clif_dispchat (cd, 0); + clif_dispchat(cd, 0); return 0; } @@ -317,16 +317,16 @@ int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger, * npcチャットルーム削除 *------------------------------------------ */ -int chat_deletenpcchat (struct npc_data *nd) +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_retr(0, nd); + nullpo_retr(0, cd = (struct chat_data *) map_id2bl(nd->chat_id)); - chat_npckickall (cd); - clif_clearchat (cd, 0); - map_delobject (cd->bl.id, BL_CHAT); // freeまでしてくれる + chat_npckickall(cd); + clif_clearchat(cd, 0); + map_delobject(cd->bl.id, BL_CHAT); // freeまでしてくれる nd->chat_id = 0; return 0; @@ -336,12 +336,12 @@ int chat_deletenpcchat (struct npc_data *nd) * 規定人数以上でイベントが定義されてるなら実行 *------------------------------------------ */ -int chat_triggerevent (struct chat_data *cd) +int chat_triggerevent(struct chat_data *cd) { - nullpo_retr (0, cd); + nullpo_retr(0, cd); if (cd->users >= cd->trigger && cd->npc_event[0]) - npc_event_do (cd->npc_event); + npc_event_do(cd->npc_event); return 0; } @@ -349,12 +349,12 @@ int chat_triggerevent (struct chat_data *cd) * イベントの有効化 *------------------------------------------ */ -int chat_enableevent (struct chat_data *cd) +int chat_enableevent(struct chat_data *cd) { - nullpo_retr (0, cd); + nullpo_retr(0, cd); cd->trigger &= 0x7f; - chat_triggerevent (cd); + chat_triggerevent(cd); return 0; } @@ -362,9 +362,9 @@ int chat_enableevent (struct chat_data *cd) * イベントの無効化 *------------------------------------------ */ -int chat_disableevent (struct chat_data *cd) +int chat_disableevent(struct chat_data *cd) { - nullpo_retr (0, cd); + nullpo_retr(0, cd); cd->trigger |= 0x80; return 0; @@ -374,13 +374,13 @@ int chat_disableevent (struct chat_data *cd) * チャットルームから全員蹴り出す *------------------------------------------ */ -int chat_npckickall (struct chat_data *cd) +int chat_npckickall(struct chat_data *cd) { - nullpo_retr (0, cd); + nullpo_retr(0, cd); while (cd->users > 0) { - chat_leavechat (cd->usersd[cd->users - 1]); + chat_leavechat(cd->usersd[cd->users - 1]); } return 0; } @@ -389,7 +389,7 @@ int chat_npckickall (struct chat_data *cd) * 終了 *------------------------------------------ */ -int do_final_chat (void) +int do_final_chat(void) { return 0; } |