diff options
Diffstat (limited to 'src/map/clif.c')
-rw-r--r-- | src/map/clif.c | 56 |
1 files changed, 24 insertions, 32 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 68d2bbc48..f73553b72 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6567,7 +6567,7 @@ void clif_party_inviteack(struct map_session_data* sd, const char* nick, int res #if PACKETVER < 20070904 if( result == 7 ) { - clif->message(fd, msg_sd(sd,3)); + clif->message(fd, msg_sd(sd,3)); // Character not found. return; } #endif @@ -10261,7 +10261,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd) if (k < sd->channel_count || channel->join(chan, sd, "", true) == HCS_STATUS_OK) { channel->send(chan,sd,message); } else { - clif->message(fd, msg_fd(fd,1402)); + clif->message(fd, msg_fd(fd,1402)); //You're not in that channel, type '@join <#channel_name>' } return; } else if (strcmpi(&chname[1], channel->config->ally_name) == 0) { @@ -11856,7 +11856,7 @@ void clif_parse_CreateParty(int fd, struct map_session_data *sd) if( map->list[sd->bl.m].flag.partylock ) { // Party locked. - clif->message(fd, msg_fd(fd,227)); + clif->message(fd, msg_fd(fd,227)); // Party modification is disabled in this map. return; } if( battle_config.basic_skill_check && pc->checkskill(sd,NV_BASIC) < 7 ) { @@ -11878,7 +11878,7 @@ void clif_parse_CreateParty2(int fd, struct map_session_data *sd) if( map->list[sd->bl.m].flag.partylock ) { // Party locked. - clif->message(fd, msg_fd(fd,227)); + clif->message(fd, msg_fd(fd,227)); // Party modification is disabled in this map. return; } if( battle_config.basic_skill_check && pc->checkskill(sd,NV_BASIC) < 7 ) { @@ -11898,7 +11898,7 @@ void clif_parse_PartyInvite(int fd, struct map_session_data *sd) { if(map->list[sd->bl.m].flag.partylock) { // Party locked. - clif->message(fd, msg_fd(fd,227)); + clif->message(fd, msg_fd(fd,227)); // Party modification is disabled in this map. return; } @@ -11922,7 +11922,7 @@ void clif_parse_PartyInvite2(int fd, struct map_session_data *sd) if(map->list[sd->bl.m].flag.partylock) { // Party locked. - clif->message(fd, msg_fd(fd,227)); + clif->message(fd, msg_fd(fd,227)); // Party modification is disabled in this map. return; } @@ -11960,7 +11960,7 @@ void clif_parse_LeaveParty(int fd, struct map_session_data *sd) __attribute__((n void clif_parse_LeaveParty(int fd, struct map_session_data *sd) { if(map->list[sd->bl.m].flag.partylock) { // Party locked. - clif->message(fd, msg_fd(fd,227)); + clif->message(fd, msg_fd(fd,227)); // Party modification is disabled in this map. return; } party->leave(sd); @@ -11972,7 +11972,7 @@ void clif_parse_RemovePartyMember(int fd, struct map_session_data *sd) __attribu void clif_parse_RemovePartyMember(int fd, struct map_session_data *sd) { if(map->list[sd->bl.m].flag.partylock) { // Party locked. - clif->message(fd, msg_fd(fd,227)); + clif->message(fd, msg_fd(fd,227)); // Party modification is disabled in this map. return; } party->removemember(sd, RFIFOL(fd,2), RFIFOP(fd,6)); @@ -12753,8 +12753,7 @@ void clif_parse_CreateGuild(int fd,struct map_session_data *sd) safestrncpy(name, RFIFOP(fd,6), NAME_LENGTH); if(map->list[sd->bl.m].flag.guildlock) { - //Guild locked. - clif->message(fd, msg_fd(fd,228)); + clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map. return; } @@ -13030,8 +13029,7 @@ bool clif_sub_guild_invite(int fd, struct map_session_data *sd, struct map_sessi nullpo_retr(false, sd); nullpo_retr(false, t_sd); if ( map->list[sd->bl.m].flag.guildlock ) { - //Guild locked. - clif->message(fd, msg_fd(fd,228)); + clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map. return false; } @@ -13084,8 +13082,7 @@ void clif_parse_GuildLeave(int fd,struct map_session_data *sd) __attribute__((no /// 0159 <guild id>.L <account id>.L <char id>.L <reason>.40B void clif_parse_GuildLeave(int fd,struct map_session_data *sd) { if(map->list[sd->bl.m].flag.guildlock) { - //Guild locked. - clif->message(fd, msg_fd(fd,228)); + clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map. return; } if( sd->bg_id ) { @@ -13101,8 +13098,7 @@ void clif_parse_GuildExpulsion(int fd,struct map_session_data *sd) __attribute__ /// 015b <guild id>.L <account id>.L <char id>.L <reason>.40B void clif_parse_GuildExpulsion(int fd,struct map_session_data *sd) { if( map->list[sd->bl.m].flag.guildlock || sd->bg_id ) { - // Guild locked. - clif->message(fd, msg_fd(fd,228)); + clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map. return; } guild->expulsion(sd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOP(fd,14)); @@ -13143,8 +13139,7 @@ void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd) { return; if(map->list[sd->bl.m].flag.guildlock) { - //Guild locked. - clif->message(fd, msg_fd(fd,228)); + clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map. return; } @@ -13181,8 +13176,7 @@ void clif_parse_GuildDelAlliance(int fd, struct map_session_data *sd) { return; if(map->list[sd->bl.m].flag.guildlock) { - //Guild locked. - clif->message(fd, msg_fd(fd,228)); + clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map. return; } guild->delalliance(sd,RFIFOL(fd,2),RFIFOL(fd,6)); @@ -13198,8 +13192,7 @@ void clif_parse_GuildOpposition(int fd, struct map_session_data *sd) { return; if(map->list[sd->bl.m].flag.guildlock) { - //Guild locked. - clif->message(fd, msg_fd(fd,228)); + clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map. return; } @@ -13222,8 +13215,7 @@ void clif_parse_GuildBreak(int fd, struct map_session_data *sd) __attribute__((n /// field name and size is same as the one in CH_DELETE_CHAR. void clif_parse_GuildBreak(int fd, struct map_session_data *sd) { if( map->list[sd->bl.m].flag.guildlock ) { - //Guild locked. - clif->message(fd, msg_fd(fd,228)); + clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map. return; } guild->dobreak(sd, RFIFOP(fd,2)); @@ -13937,7 +13929,7 @@ void clif_parse_FriendsListAdd(int fd, struct map_session_data *sd) // Friend doesn't exist (no player with this name) if (f_sd == NULL) { - clif->message(fd, msg_fd(fd,3)); + clif->message(fd, msg_fd(fd,3)); // "Character not found." return; } @@ -15282,7 +15274,7 @@ void clif_parse_Auction_register(int fd, struct map_session_data *sd) // Auction checks... if( sd->status.inventory[sd->auction.index].bound && !pc_can_give_bound_items(sd) ) { - clif->message(sd->fd, msg_sd(sd,293)); + clif->message(sd->fd, msg_sd(sd,293)); // This bound item cannot be traded to that character. clif->auction_message(fd, 2); // The auction has been canceled return; } @@ -15335,7 +15327,7 @@ void clif_parse_Auction_bid(int fd, struct map_session_data *sd) int bid = RFIFOL(fd,6); if( !pc_can_give_items(sd) ) { //They aren't supposed to give zeny [Inkfish] - clif->message(sd->fd, msg_sd(sd,246)); + clif->message(sd->fd, msg_sd(sd,246)); // Your GM level doesn't authorize you to perform this action. return; } @@ -18347,7 +18339,7 @@ void clif_parse_RouletteOpen(int fd, struct map_session_data* sd) { struct packet_roulette_open_ack p; if( !battle_config.feature_roulette ) { - clif->message(fd,"Roulette is disabled"); + clif->message(fd, msg_fd(fd,82)); // Roulette is disabled return; } @@ -18370,7 +18362,7 @@ void clif_parse_RouletteInfo(int fd, struct map_session_data* sd) { unsigned short i, j, count = 0; if( !battle_config.feature_roulette ) { - clif->message(fd,"Roulette is disabled"); + clif->message(fd, msg_fd(fd,82)); // Roulette is disabled return; } @@ -18394,7 +18386,7 @@ void clif_parse_RouletteInfo(int fd, struct map_session_data* sd) { void clif_parse_RouletteClose(int fd, struct map_session_data* sd) __attribute__((nonnull (2))); void clif_parse_RouletteClose(int fd, struct map_session_data* sd) { if( !battle_config.feature_roulette ) { - clif->message(fd,"Roulette is disabled"); + clif->message(fd, msg_fd(fd,82)); // Roulette is disabled return; } @@ -18410,7 +18402,7 @@ void clif_parse_RouletteGenerate(int fd, struct map_session_data* sd) { short stage = sd->roulette.stage; if( !battle_config.feature_roulette ) { - clif->message(fd,"Roulette is disabled"); + clif->message(fd, msg_fd(fd,82)); // Roulette is disabled return; } @@ -18466,7 +18458,7 @@ void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd) { struct packet_roulette_itemrecv_ack p; if( !battle_config.feature_roulette ) { - clif->message(fd,"Roulette is disabled"); + clif->message(fd, msg_fd(fd,82)); // Roulette is disabled return; } |