From 03ce9e5a69b54535ea70b3776004dd7ade7e6134 Mon Sep 17 00:00:00 2001 From: epuncker Date: Fri, 22 Jul 2016 11:39:10 -0300 Subject: [PATCH] Added a missing entry into messages.conf and added some comments where missing, ref #1282 --- conf/messages.conf | 3 ++- src/map/atcommand.c | 12 +++++----- src/map/buyingstore.c | 6 ++--- src/map/chat.c | 4 ++-- src/map/chrif.c | 4 ++-- src/map/clif.c | 56 +++++++++++++++++++------------------------ src/map/party.c | 9 ++++--- src/map/pc.c | 8 +++---- src/map/storage.c | 12 +++++----- src/map/trade.c | 12 +++++----- src/map/vending.c | 3 +-- 11 files changed, 60 insertions(+), 69 deletions(-) diff --git a/conf/messages.conf b/conf/messages.conf index c32b253c1ea..b9386b88e6b 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -97,7 +97,8 @@ 79: %d results found. 80: Please specify a display name or monster name/id. 81: Your GM level doesn't authorize you to perform this action on the specified player. -//82-83 FREE +82: Roulette is disabled +//83 FREE 84: All stats changed! 85: Invalid time for ban command. //86-87 FREE diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 66ccbe3b057..5b337e759fd 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -466,11 +466,11 @@ ACMD(mapmove) { x = y = 0; //Invalid cell, use random spot. } if (map->list[m].flag.nowarpto && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) { - clif->message(fd, msg_fd(fd,247)); + clif->message(fd, msg_fd(fd,247)); // You are not authorized to warp to this map. return false; } if (sd->bl.m >= 0 && map->list[sd->bl.m].flag.nowarp && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) { - clif->message(fd, msg_fd(fd,248)); + clif->message(fd, msg_fd(fd,248)); // You are not authorized to warp from your current map. return false; } if (pc->setpos(sd, map_index, x, y, CLR_TELEPORT) != 0) { @@ -854,7 +854,7 @@ ACMD(storage) return false; if (storage->open(sd) == 1) { //Already open. - clif->message(fd, msg_fd(fd,250)); + clif->message(fd, msg_fd(fd,250)); // You have already opened your storage. Close it first. return false; } @@ -869,7 +869,7 @@ ACMD(storage) ACMD(guildstorage) { if (!sd->status.guild_id) { - clif->message(fd, msg_fd(fd,252)); + clif->message(fd, msg_fd(fd,252)); // You are not in a guild. return false; } @@ -877,12 +877,12 @@ ACMD(guildstorage) return false; if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) { - clif->message(fd, msg_fd(fd,250)); + clif->message(fd, msg_fd(fd,250)); // You have already opened your storage. Close it first. return false; } if (sd->state.storage_flag == STORAGE_FLAG_GUILD) { - clif->message(fd, msg_fd(fd,251)); + clif->message(fd, msg_fd(fd,251)); // You have already opened your guild storage. Close it first. return false; } diff --git a/src/map/buyingstore.c b/src/map/buyingstore.c index 3828a3c1405..58a1f925f21 100644 --- a/src/map/buyingstore.c +++ b/src/map/buyingstore.c @@ -100,7 +100,7 @@ void buyingstore_create(struct map_session_data* sd, int zenylimit, unsigned cha if( !pc_can_give_items(sd) ) {// custom: GM is not allowed to buy (give zeny) sd->buyingstore.slots = 0; - 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. clif->buyingstore_open_failed(sd, BUYINGSTORE_CREATE, 0); return; } @@ -222,7 +222,7 @@ void buyingstore_open(struct map_session_data* sd, int account_id) if( !pc_can_give_items(sd) ) {// custom: GM is not allowed to sell - 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; } @@ -261,7 +261,7 @@ void buyingstore_trade(struct map_session_data* sd, int account_id, unsigned int if( !pc_can_give_items(sd) ) {// custom: GM is not allowed to sell - 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. clif->buyingstore_trade_failed_seller(sd, BUYINGSTORE_TRADE_SELLER_FAILED, 0); return; } diff --git a/src/map/chat.c b/src/map/chat.c index 2fe1aacd4ca..145d44d1e18 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -106,8 +106,8 @@ bool chat_createpcchat(struct map_session_data* sd, const char* title, const cha } if( map->list[sd->bl.m].flag.nochat ) { - clif->message(sd->fd, msg_sd(sd,281)); - return false; //Can't create chatrooms on this map. + clif->message(sd->fd, msg_sd(sd,281)); // You can't create chat rooms in this map + return false; } if (map->getcell(sd->bl.m, &sd->bl, sd->bl.x, sd->bl.y, CELL_CHKNOCHAT) ) { diff --git a/src/map/chrif.c b/src/map/chrif.c index 51e8e514324..d641c6dd323 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -999,9 +999,9 @@ void chrif_idbanned(int fd) { if(0message(sd->fd, msg_sd(sd,411+ret_status)); // Message IDs (for search convenience): 412, 413, 414, 415, 416, 417, 418, 419, 420 else if(ret_status==100) - clif->message(sd->fd, msg_sd(sd,421)); + clif->message(sd->fd, msg_sd(sd,421)); // Your account has been totally erased. else - clif->message(sd->fd, msg_sd(sd,420)); //"Your account has not more authorized." + clif->message(sd->fd, msg_sd(sd,420)); //"Your account is not longer authorized." } else if (RFIFOB(fd,6) == 1) { // 1: ban time_t timestamp; char tmpstr[2048]; diff --git a/src/map/clif.c b/src/map/clif.c index 68d2bbc4846..f73553b72ee 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 .L .L .L .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 .L .L .L .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; } diff --git a/src/map/party.c b/src/map/party.c index d0d46608376..c471cceb960 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -362,7 +362,7 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd) ARR_FIND(0, MAX_PARTY, i, p->data[i].sd == sd); if( i == MAX_PARTY || !p->party.member[i].leader ) { - clif->message(sd->fd, msg_sd(sd,282)); + clif->message(sd->fd, msg_sd(sd,282)); // You need to be a party leader to use this command. return 0; } @@ -682,12 +682,12 @@ bool party_changeleader(struct map_session_data *sd, struct map_session_data *ts return false; if (!tsd || tsd->status.party_id != sd->status.party_id) { - clif->message(sd->fd, msg_sd(sd,283)); + clif->message(sd->fd, msg_sd(sd,283)); // Target character must be online and in your current party. return false; } if( map->list[sd->bl.m].flag.partylock ) { - clif->message(sd->fd, msg_sd(sd,287)); + clif->message(sd->fd, msg_sd(sd,287)); // You cannot change party leaders in this map. return false; } @@ -699,8 +699,7 @@ bool party_changeleader(struct map_session_data *sd, struct map_session_data *ts return false; //Shouldn't happen if (!p->party.member[mi].leader) { - //Need to be a party leader. - clif->message(sd->fd, msg_sd(sd,282)); + clif->message(sd->fd, msg_sd(sd,282)); // You need to be a party leader to use this command. return false; } diff --git a/src/map/pc.c b/src/map/pc.c index 27bd71b646c..414b236d7a4 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4646,13 +4646,13 @@ int pc_dropitem(struct map_session_data *sd,int n,int amount) return 0; if( map->list[sd->bl.m].flag.nodrop ) { - clif->message (sd->fd, msg_sd(sd,271)); - return 0; //Can't drop items in nodrop mapflag maps. + clif->message (sd->fd, msg_sd(sd,271)); // You can't drop items in this map + return 0; } if( !pc->candrop(sd,&sd->status.inventory[n]) ) { - clif->message (sd->fd, msg_sd(sd,263)); + clif->message (sd->fd, msg_sd(sd,263)); // This item cannot be dropped. return 0; } @@ -5097,7 +5097,7 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun if (!itemdb_cancartstore(item_data, pc_get_group_level(sd)) || (item_data->bound > IBT_ACCOUNT && !pc_can_give_bound_items(sd))) { // Check item trade restrictions - clif->message (sd->fd, msg_sd(sd,264)); + clif->message (sd->fd, msg_sd(sd,264)); // This item cannot be stored. return 1;/* TODO: there is no official response to this? */ } diff --git a/src/map/storage.c b/src/map/storage.c index 91b37eb197f..4272f96116f 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -107,7 +107,7 @@ int storage_storageopen(struct map_session_data *sd) if( !pc_can_give_items(sd) ) { //check is this GM level is allowed to put items to storage - 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 1; } @@ -158,12 +158,12 @@ int storage_additem(struct map_session_data* sd, struct item* item_data, int amo if (!itemdb_canstore(item_data, pc_get_group_level(sd))) { //Check if item is storable. [Skotlex] - clif->message (sd->fd, msg_sd(sd,264)); + clif->message (sd->fd, msg_sd(sd,264)); // This item cannot be stored. return 1; } if( item_data->bound > IBT_ACCOUNT && !pc_can_give_bound_items(sd) ) { - clif->message(sd->fd, msg_sd(sd,294)); + clif->message(sd->fd, msg_sd(sd,294)); // This bound item cannot be stored there. return 1; } @@ -407,7 +407,7 @@ int storage_guild_storageopen(struct map_session_data* sd) return 1; //Can't open both storages at a time. if( !pc_can_give_items(sd) ) { //check is this GM level can open guild storage and store items [Lupus] - 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 1; } @@ -456,12 +456,12 @@ int guild_storage_additem(struct map_session_data* sd, struct guild_storage* sto if (!itemdb_canguildstore(item_data, pc_get_group_level(sd)) || item_data->expire_time) { //Check if item is storable. [Skotlex] - clif->message (sd->fd, msg_sd(sd,264)); + clif->message (sd->fd, msg_sd(sd,264)); // This item cannot be stored. return 1; } if( item_data->bound && item_data->bound != IBT_GUILD && !pc_can_give_bound_items(sd) ) { - clif->message(sd->fd, msg_sd(sd,294)); + clif->message(sd->fd, msg_sd(sd,294)); // This bound item cannot be stored there. return 1; } diff --git a/src/map/trade.c b/src/map/trade.c index 6352c3a4d74..d6bdd14e58f 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -51,8 +51,8 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta nullpo_retv(sd); if (map->list[sd->bl.m].flag.notrade) { - clif->message (sd->fd, msg_sd(sd,272)); - return; //Can't trade in notrade mapflag maps. + clif->message (sd->fd, msg_sd(sd,272)); // You can't trade in this map + return; } if (target_sd == NULL || sd == target_sd) { @@ -90,7 +90,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta if (!pc_can_give_items(sd) || !pc_can_give_items(target_sd)) //check if both GMs are allowed to trade { - 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. clif->tradestart(sd, 2); // GM is not allowed to trade return; } @@ -372,14 +372,14 @@ void trade_tradeadditem(struct map_session_data *sd, short index, short amount) if( !itemdb_cantrade(item, src_lv, dst_lv) && //Can't trade (pc->get_partner(sd) != target_sd || !itemdb_canpartnertrade(item, src_lv, dst_lv)) ) //Can't partner-trade { - clif->message (sd->fd, msg_sd(sd,260)); + clif->message (sd->fd, msg_sd(sd,260)); // This item cannot be traded. clif->tradeitemok(sd, index+2, TIO_INDROCKS); return; } if( item->expire_time ) { // Rental System - clif->message (sd->fd, msg_sd(sd,260)); + clif->message (sd->fd, msg_sd(sd,260)); // This item cannot be traded. clif->tradeitemok(sd, index+2, TIO_INDROCKS); return; } @@ -388,7 +388,7 @@ void trade_tradeadditem(struct map_session_data *sd, short index, short amount) !( item->bound == IBT_GUILD && sd->status.guild_id == target_sd->status.guild_id ) && !( item->bound == IBT_PARTY && sd->status.party_id == target_sd->status.party_id ) && !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->tradeitemok(sd, index+2, TIO_INDROCKS); return; } diff --git a/src/map/vending.c b/src/map/vending.c index 3ae1017f886..0eb5e39e28a 100644 --- a/src/map/vending.c +++ b/src/map/vending.c @@ -74,8 +74,7 @@ void vending_vendinglistreq(struct map_session_data* sd, unsigned int id) { return; // not vending if (!pc_can_give_items(sd) || !pc_can_give_items(vsd)) { //check if both GMs are allowed to trade - // GM is not allowed to trade - 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; }