diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 8 | ||||
| -rw-r--r-- | src/map/charcommand.c | 4 | ||||
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/npc_chat.c | 12 | ||||
| -rw-r--r-- | src/map/script.c | 7 |
5 files changed, 15 insertions, 18 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 073503505..232b53569 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4456,7 +4456,7 @@ int atcommand_char_block(const int fd, struct map_session_data* sd, const char* return -1; } else { chrif_char_ask_name(sd->status.account_id, atcmd_player_name, 1, 0, 0, 0, 0, 0, 0); // type: 1 - block - clif_displaymessage(fd, msg_txt(88)); // Character name sends to char-server to ask it. + clif_displaymessage(fd, msg_txt(88)); // Character name sent to char-server to ask it. } return 0; @@ -4542,7 +4542,7 @@ int atcommand_char_ban(const int fd, struct map_session_data* sd, const char* co return -1; } else { chrif_char_ask_name(sd->status.account_id, atcmd_player_name, 2, year, month, day, hour, minute, second); // type: 2 - ban - clif_displaymessage(fd, msg_txt(88)); // Character name sends to char-server to ask it. + clif_displaymessage(fd, msg_txt(88)); // Character name sent to char-server to ask it. } return 0; @@ -4573,7 +4573,7 @@ int atcommand_char_unblock(const int fd, struct map_session_data* sd, const char } else { // send answer to login server via char-server chrif_char_ask_name(sd->status.account_id, atcmd_player_name, 3, 0, 0, 0, 0, 0, 0); // type: 3 - unblock - clif_displaymessage(fd, msg_txt(88)); // Character name sends to char-server to ask it. + clif_displaymessage(fd, msg_txt(88)); // Character name sent to char-server to ask it. } return 0; @@ -4604,7 +4604,7 @@ int atcommand_char_unban(const int fd, struct map_session_data* sd, const char* } else { // send answer to login server via char-server chrif_char_ask_name(sd->status.account_id, atcmd_player_name, 4, 0, 0, 0, 0, 0, 0); // type: 4 - unban - clif_displaymessage(fd, msg_txt(88)); // Character name sends to char-server to ask it. + clif_displaymessage(fd, msg_txt(88)); // Character name sent to char-server to ask it. } return 0; diff --git a/src/map/charcommand.c b/src/map/charcommand.c index 743f456f6..f531f3fc0 100644 --- a/src/map/charcommand.c +++ b/src/map/charcommand.c @@ -1170,7 +1170,7 @@ int charcommand_warp( } if (pc_setpos(pl_sd, map[m].index, x, y, 3) == 0) { clif_displaymessage(pl_sd->fd, msg_table[0]); // Warped. - clif_displaymessage(fd, msg_table[15]); // Player warped (message sends to player too). + clif_displaymessage(fd, msg_table[15]); // Player warped (message sent to player too). return 0; } //No error message specified...? @@ -1755,7 +1755,7 @@ int charcommand_changesex( return -1; } else { chrif_char_ask_name(sd->status.account_id, player, 5, 0, 0, 0, 0, 0, 0); // type: 5 - changesex - clif_displaymessage(fd, msg_table[88]); // Character name sends to char-server to ask it. + clif_displaymessage(fd, msg_table[88]); // Character name sent to char-server to ask it. } return 0; diff --git a/src/map/clif.c b/src/map/clif.c index 559bb4f69..457abb254 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9225,7 +9225,7 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd) return; } - //Client doesn't sends the position for ammo. + //Client doesn't send the position for ammo. if(sd->inventory_data[index]->type == IT_AMMO) pc_equipitem(sd,index,EQP_AMMO); else diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c index 9cee26f8e..bd39a588c 100644 --- a/src/map/npc_chat.c +++ b/src/map/npc_chat.c @@ -478,9 +478,9 @@ int mob_chat_sub(struct block_list *bl, va_list ap){ // Various script builtins used to support these functions int buildin_defpattern(struct script_state *st) { - int setid=conv_num(st,& (st->stack->stack_data[st->start+2])); - const char *pattern=conv_str(st,& (st->stack->stack_data[st->start+3])); - const char *label=conv_str(st,& (st->stack->stack_data[st->start+4])); + int setid=conv_num(st, script_getdata(st,2)); + const char *pattern=conv_str(st, script_getdata(st,3)); + const char *label=conv_str(st, script_getdata(st,4)); struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid); npc_chat_def_pattern(nd, setid, pattern, label); @@ -489,7 +489,7 @@ int buildin_defpattern(struct script_state *st) { } int buildin_activatepset(struct script_state *st) { - int setid=conv_num(st,& (st->stack->stack_data[st->start+2])); + int setid=conv_num(st, script_getdata(st,2)); struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid); activate_pcreset(nd, setid); @@ -497,7 +497,7 @@ int buildin_activatepset(struct script_state *st) { return 0; } int buildin_deactivatepset(struct script_state *st) { - int setid=conv_num(st,& (st->stack->stack_data[st->start+2])); + int setid=conv_num(st, script_getdata(st,2)); struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid); deactivate_pcreset(nd, setid); @@ -505,7 +505,7 @@ int buildin_deactivatepset(struct script_state *st) { return 0; } int buildin_deletepset(struct script_state *st) { - int setid=conv_num(st,& (st->stack->stack_data[st->start+2])); + int setid=conv_num(st, script_getdata(st,2)); struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid); delete_pcreset(nd, setid); diff --git a/src/map/script.c b/src/map/script.c index 62c88a8b9..0403cf212 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -10939,11 +10939,8 @@ BUILDIN_FUNC(message) } /*========================================== - * npctalk (sends message to surrounding - * area) [Valaris] - *------------------------------------------ - */ - + * npctalk (sends message to surrounding area) + *------------------------------------------*/ BUILDIN_FUNC(npctalk) { const char *str; |