From 634aeeb9d58b01f9de6632a014a063ef0c4cf31e Mon Sep 17 00:00:00 2001 From: Chuck Miller Date: Fri, 25 Dec 2009 05:00:31 -0500 Subject: Used the "indent" C formatting program from GNU to do some clean ups The command options used was: -nbad -bap -sc -bl -blf -bli0 -cli4 -cbi0 -di5 -nbc -bls -ip2 -nut -ts4 -bap -i4 -sob -npsl --- src/map/chat.c | 515 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 269 insertions(+), 246 deletions(-) (limited to 'src/map/chat.c') diff --git a/src/map/chat.c b/src/map/chat.c index 8af50da..1005205 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -16,358 +16,381 @@ #include "memwatch.h" #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,char* pass,char* title,int titlelen) +int chat_createchat (struct map_session_data *sd, int limit, int pub, + char *pass, char *title, int titlelen) { - struct chat_data *cd; - - nullpo_retr(0, sd); - - cd = aCalloc(1,sizeof(struct chat_data)); - - 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; + struct chat_data *cd; + + nullpo_retr (0, sd); + + cd = aCalloc (1, sizeof (struct chat_data)); + + 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,char* pass) +int chat_joinchat (struct map_session_data *sd, int chatid, char *pass) { - struct chat_data *cd; + struct chat_data *cd; + + nullpo_retr (0, sd); - nullpo_retr(0, sd); + cd = (struct chat_data *) map_id2bl (chatid); + if (cd == NULL) + return 1; - 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; + } - 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++; - 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; + return 0; } /*========================================== * チャットルームから抜ける *------------------------------------------ */ -int chat_leavechat(struct map_session_data *sd) +int chat_leavechat (struct map_session_data *sd) { - struct chat_data *cd; - int i,leavechar; - - nullpo_retr(1, sd); - - cd=(struct chat_data*)map_id2bl(sd->chatID); - if(cd==NULL) - return 1; - - for(i = 0,leavechar=-1;i < cd->users;i++){ - if(cd->usersd[i] == sd){ - leavechar=i; - break; - } - } - if(leavechar<0) // そのchatに所属していないらしい (バグ時のみ) - return -1; - - if(leavechar==0 && cd->users>1 && (*cd->owner)->type==BL_PC){ - // 所有者だった&他に人が居る&PCのチャット - clif_changechatowner(cd,cd->usersd[1]); - clif_clearchat(cd,0); - } - - // 抜けるPCにも送るのでusersを減らす前に実行 - clif_leavechat(cd,sd); - - cd->users--; - 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までしてくれる - } else { - for(i=leavechar;i < cd->users;i++) - cd->usersd[i] = cd->usersd[i+1]; - if(leavechar==0 && (*cd->owner)->type==BL_PC){ - // PCのチャットなので所有者が抜けたので位置変更 - cd->bl.x=cd->usersd[0]->bl.x; - cd->bl.y=cd->usersd[0]->bl.y; - } - clif_dispchat(cd,0); - } - - return 0; + struct chat_data *cd; + int i, leavechar; + + nullpo_retr (1, sd); + + cd = (struct chat_data *) map_id2bl (sd->chatID); + if (cd == NULL) + return 1; + + for (i = 0, leavechar = -1; i < cd->users; i++) + { + if (cd->usersd[i] == sd) + { + leavechar = i; + break; + } + } + if (leavechar < 0) // そのchatに所属していないらしい (バグ時のみ) + return -1; + + if (leavechar == 0 && cd->users > 1 && (*cd->owner)->type == BL_PC) + { + // 所有者だった&他に人が居る&PCのチャット + clif_changechatowner (cd, cd->usersd[1]); + clif_clearchat (cd, 0); + } + + // 抜けるPCにも送るのでusersを減らす前に実行 + clif_leavechat (cd, sd); + + cd->users--; + 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までしてくれる + } + else + { + for (i = leavechar; i < cd->users; i++) + cd->usersd[i] = cd->usersd[i + 1]; + if (leavechar == 0 && (*cd->owner)->type == BL_PC) + { + // PCのチャットなので所有者が抜けたので位置変更 + cd->bl.x = cd->usersd[0]->bl.x; + cd->bl.y = cd->usersd[0]->bl.y; + } + clif_dispchat (cd, 0); + } + + return 0; } /*========================================== * チャットルームの持ち主を譲る *------------------------------------------ */ -int chat_changechatowner(struct map_session_data *sd,char *nextownername) +int chat_changechatowner (struct map_session_data *sd, 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; + 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,char* pass,char* title,int titlelen) +int chat_changechatstatus (struct map_session_data *sd, int limit, int pub, + char *pass, char *title, int titlelen) { - struct chat_data *cd; + struct chat_data *cd; - nullpo_retr(1, sd); + nullpo_retr (1, sd); - cd=(struct chat_data*)map_id2bl(sd->chatID); - if(cd==NULL || (struct block_list *)sd!=(*cd->owner)) - return 1; + 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; + 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); + clif_changechatstatus (cd); + clif_dispchat (cd, 0); - return 0; + return 0; } /*========================================== * チャットルームから蹴り出す *------------------------------------------ */ -int chat_kickchat(struct map_session_data *sd,char *kickusername) +int chat_kickchat (struct map_session_data *sd, char *kickusername) { - struct chat_data *cd; - int i,kickuser; + struct chat_data *cd; + int i, kickuser; - nullpo_retr(1, sd); + nullpo_retr (1, sd); - cd=(struct chat_data*)map_id2bl(sd->chatID); - if(cd==NULL || (struct block_list *)sd!=(*cd->owner)) - return 1; + 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; + 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]); + chat_leavechat (cd->usersd[kickuser]); - return 0; + return 0; } /*========================================== * npcチャットルーム作成 *------------------------------------------ */ -int chat_createnpcchat(struct npc_data *nd,int limit,int pub,int trigger,char* title,int titlelen,const char *ev) +int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger, + char *title, int titlelen, const char *ev) { - struct chat_data *cd; - - nullpo_retr(1, nd); - - cd = aCalloc(1,sizeof(struct chat_data)); - - 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); - cd->title[titlelen]=0; - - cd->bl.m = nd->bl.m; - cd->bl.x = nd->bl.x; - cd->bl.y = nd->bl.y; - cd->bl.type = BL_CHAT; - cd->owner_ = (struct block_list *)nd; - cd->owner = &cd->owner_; - memcpy(cd->npc_event,ev,sizeof(cd->npc_event)); - - cd->bl.id = map_addobject(&cd->bl); - if(cd->bl.id==0){ - free(cd); - return 0; - } - nd->chat_id=cd->bl.id; - - clif_dispchat(cd,0); - - return 0; + struct chat_data *cd; + + nullpo_retr (1, nd); + + cd = aCalloc (1, sizeof (struct chat_data)); + + 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); + cd->title[titlelen] = 0; + + cd->bl.m = nd->bl.m; + cd->bl.x = nd->bl.x; + cd->bl.y = nd->bl.y; + cd->bl.type = BL_CHAT; + cd->owner_ = (struct block_list *) nd; + cd->owner = &cd->owner_; + memcpy (cd->npc_event, ev, sizeof (cd->npc_event)); + + cd->bl.id = map_addobject (&cd->bl); + if (cd->bl.id == 0) + { + free (cd); + return 0; + } + nd->chat_id = cd->bl.id; + + clif_dispchat (cd, 0); + + return 0; } + /*========================================== * 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)); - - chat_npckickall(cd); - clif_clearchat(cd,0); - map_delobject(cd->bl.id, BL_CHAT); // freeまでしてくれる - nd->chat_id=0; - - return 0; + struct chat_data *cd; + + 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までしてくれる + nd->chat_id = 0; + + return 0; } /*========================================== * 規定人数以上でイベントが定義されてるなら実行 *------------------------------------------ */ -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); - return 0; + if (cd->users >= cd->trigger && cd->npc_event[0]) + npc_event_do (cd->npc_event); + return 0; } /*========================================== * イベントの有効化 *------------------------------------------ */ -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); - return 0; + cd->trigger &= 0x7f; + chat_triggerevent (cd); + return 0; } + /*========================================== * イベントの無効化 *------------------------------------------ */ -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; + cd->trigger |= 0x80; + return 0; } + /*========================================== * チャットルームから全員蹴り出す *------------------------------------------ */ -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]); - } - return 0; + while (cd->users > 0) + { + chat_leavechat (cd->usersd[cd->users - 1]); + } + return 0; } /*========================================== * 終了 *------------------------------------------ */ -int do_final_chat(void) +int do_final_chat (void) { - return 0; + return 0; } -- cgit v1.2.3-60-g2f50