summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/map/clif.c9
-rw-r--r--src/map/tmw.c39
2 files changed, 27 insertions, 21 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 00b3ea5..e78da71 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8865,12 +8865,14 @@ void clif_parse_GMHide (int fd, struct map_session_data *sd)
if (sd->status.option & OPTION_HIDE)
{ // OPTION_HIDE = 0x40
sd->status.option &= ~OPTION_HIDE; // OPTION_HIDE = 0x40
- clif_displaymessage (fd, "Invisible: Off.");
+ /* "Invisible: Off." */
+ clif_displaymessage (fd, msg_txt (10));
}
else
{
sd->status.option |= OPTION_HIDE; // OPTION_HIDE = 0x40
- clif_displaymessage (fd, "Invisible: On.");
+ /* "Invisible: On." */
+ clif_displaymessage (fd, msg_txt (11));
}
clif_changeoption (&sd->bl);
}
@@ -8893,7 +8895,8 @@ void clif_parse_GMReqNoChat (int fd, struct map_session_data *sd)
if (!battle_config.muting_players)
{
- clif_displaymessage (fd, "Muting is disabled.");
+ /* "Muting is disabled." */
+ clif_displaymessage (fd, msg_txt (245));
return;
}
diff --git a/src/map/tmw.c b/src/map/tmw.c
index 8fcfd0d..783875a 100644
--- a/src/map/tmw.c
+++ b/src/map/tmw.c
@@ -78,7 +78,7 @@ int tmw_CheckChatSpam (struct map_session_data *sd, char *message)
{
sd->chat_lines_in = sd->chat_total_repeats = 0;
- tmw_AutoBan(sd, "chat", battle_config.chat_spam_ban);
+ tmw_AutoBan (sd, "chat", battle_config.chat_spam_ban);
return 1;
}
@@ -87,10 +87,10 @@ int tmw_CheckChatSpam (struct map_session_data *sd, char *message)
(sd->chat_lines_in >= battle_config.chat_spam_warn
|| sd->chat_total_repeats >= battle_config.chat_spam_warn))
{
- clif_displaymessage (sd->fd,
- "WARNING : You are about to be automaticly banned for spam!");
- clif_displaymessage (sd->fd,
- "WARNING : Please slow down, do not repeat, and do not SHOUT!");
+ /* "WARNING: You are about to be automatically banned for spam!" */
+ clif_displaymessage (sd->fd, msg_txt (506));
+ /* "WARNING: Please slow down, do not repeat, and do not SHOUT!" */
+ clif_displaymessage (sd->fd, msg_txt (507));
}
return 0;
@@ -98,24 +98,27 @@ int tmw_CheckChatSpam (struct map_session_data *sd, char *message)
void tmw_AutoBan(struct map_session_data *sd, char *reason, int length)
{
- char anotherbuf[512];
+ char anotherbuf[512];
- if (length == 0 || sd->auto_ban_info.in_progress)
- return;
+ if (length == 0 || sd->auto_ban_info.in_progress)
+ return;
- sd->auto_ban_info.in_progress = 1;
+ sd->auto_ban_info.in_progress = 1;
- tmw_GmHackMsg ("%s has been autobanned for %s spam",
- sd->status.name, reason);
+ tmw_GmHackMsg ("%s has been autobanned for %s spam",
+ sd->status.name, reason);
- gm_log ("%s(%d,%d) Server : @autoban %s %dh (%s spam)",
- map[sd->bl.m].name, sd->bl.x, sd->bl.y,
- sd->status.name, length, reason);
+ gm_log ("%s(%d,%d) Server : @autoban %s %dh (%s spam)",
+ map[sd->bl.m].name, sd->bl.x, sd->bl.y,
+ sd->status.name, length, reason);
- snprintf(anotherbuf, 511, "You have been banned for %s spamming. Please do not spam.", reason);
- clif_displaymessage (sd->fd, anotherbuf);
- chrif_char_ask_name (-1, sd->status.name, 2, 0, 0, 0, length, 0, 0); // type: 2 - ban (year, month, day, hour, minute, second)
- clif_setwaitclose (sd->fd);
+ /* "You have been banned for %s spamming. Please do not spam." */
+ snprintf (anotherbuf, 511, msg_txt (508), reason);
+
+ clif_displaymessage (sd->fd, anotherbuf);
+ /* type: 2 - ban (year, month, day, hour, minute, second) */
+ chrif_char_ask_name (-1, sd->status.name, 2, 0, 0, 0, length, 0, 0);
+ clif_setwaitclose (sd->fd);
}
// Compares the length of two strings and returns that of the shorter