summaryrefslogtreecommitdiff
path: root/src/map/tmw.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/tmw.cpp')
-rw-r--r--src/map/tmw.cpp125
1 files changed, 54 insertions, 71 deletions
diff --git a/src/map/tmw.cpp b/src/map/tmw.cpp
index 4b1831b..66b8bb9 100644
--- a/src/map/tmw.cpp
+++ b/src/map/tmw.cpp
@@ -1,62 +1,55 @@
-//
-
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-
#include "tmw.hpp"
-#include "../common/socket.hpp"
-#include "../common/timer.hpp"
-#include "../common/version.hpp"
+#include <cctype>
+#include <cstring>
+
+#include "../common/cxxstdio.hpp"
#include "../common/nullpo.hpp"
#include "atcommand.hpp"
#include "battle.hpp"
-#include "chat.hpp"
#include "chrif.hpp"
#include "clif.hpp"
-#include "guild.hpp"
#include "intif.hpp"
-#include "itemdb.hpp"
-#include "magic.hpp"
#include "map.hpp"
-#include "mob.hpp"
-#include "npc.hpp"
-#include "party.hpp"
#include "pc.hpp"
-#include "script.hpp"
-#include "skill.hpp"
-#include "storage.hpp"
-#include "trade.hpp"
-int tmw_CheckChatSpam (struct map_session_data *sd, const char *message)
+#include "../poison.hpp"
+
+static
+void tmw_AutoBan(struct map_session_data *sd, const char *reason, int length);
+static
+int tmw_CheckChatLameness(struct map_session_data *sd, const char *message);
+static
+int tmw_ShorterStrlen(const char *s1, const char *s2);
+
+
+int tmw_CheckChatSpam(struct map_session_data *sd, const char *message)
{
- nullpo_retr (1, sd);
- time_t now = time (NULL);
+ nullpo_retr(1, sd);
+ TimeT now = TimeT::now();
- if (pc_isGM (sd))
+ if (pc_isGM(sd))
return 0;
if (now > sd->chat_reset_due)
{
- sd->chat_reset_due = now + battle_config.chat_spam_threshold;
+ sd->chat_reset_due = static_cast<time_t>(now) + battle_config.chat_spam_threshold;
sd->chat_lines_in = 0;
}
if (now > sd->chat_repeat_reset_due)
{
sd->chat_repeat_reset_due =
- now + (battle_config.chat_spam_threshold * 60);
+ static_cast<time_t>(now) + (battle_config.chat_spam_threshold * 60);
sd->chat_total_repeats = 0;
}
sd->chat_lines_in++;
// Penalty for repeats.
- if (strncmp
- (sd->chat_lastmsg, message,
- tmw_ShorterStrlen (sd->chat_lastmsg, message)) == 0)
+ if (strncmp(sd->chat_lastmsg, message,
+ tmw_ShorterStrlen(sd->chat_lastmsg, message)) == 0)
{
sd->chat_lines_in += battle_config.chat_lame_penalty;
sd->chat_total_repeats++;
@@ -67,17 +60,17 @@ int tmw_CheckChatSpam (struct map_session_data *sd, const char *message)
}
// Penalty for lame, it can stack on top of the repeat penalty.
- if (tmw_CheckChatLameness (sd, message))
+ if (tmw_CheckChatLameness(sd, message))
sd->chat_lines_in += battle_config.chat_lame_penalty;
- strncpy ((char *) sd->chat_lastmsg, message, battle_config.chat_maxline);
+ strncpy((char *) sd->chat_lastmsg, message, battle_config.chat_maxline);
if (sd->chat_lines_in >= battle_config.chat_spam_flood
|| sd->chat_total_repeats >= battle_config.chat_spam_flood)
{
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;
}
@@ -86,8 +79,8 @@ int tmw_CheckChatSpam (struct map_session_data *sd, const 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 automatically banned for spam!");
- clif_displaymessage (sd->fd, "WARNING: Please slow down, do not repeat, and do not SHOUT!");
+ clif_displaymessage(sd->fd, "WARNING: You are about to be automatically banned for spam!");
+ clif_displaymessage(sd->fd, "WARNING: Please slow down, do not repeat, and do not SHOUT!");
}
return 0;
@@ -95,43 +88,44 @@ int tmw_CheckChatSpam (struct map_session_data *sd, const char *message)
void tmw_AutoBan(struct map_session_data *sd, const char *reason, int length)
{
- char anotherbuf[512];
-
if (length == 0 || sd->auto_ban_info.in_progress)
return;
sd->auto_ban_info.in_progress = 1;
- tmw_GmHackMsg ("%s has been autobanned for %s spam",
- sd->status.name, reason);
+ std::string hack_msg = STRPRINTF("[GM] %s has been autobanned for %s spam",
+ sd->status.name,
+ reason);
+ tmw_GmHackMsg(hack_msg);
- gm_log ("%s(%d,%d) Server : @autoban %s %dh (%s spam)",
- map[sd->bl.m].name, sd->bl.x, sd->bl.y,
+ std::string fake_command = STRPRINTF("@autoban %s %dh (%s spam)",
sd->status.name, length, reason);
+ log_atcommand(sd, fake_command);
- snprintf (anotherbuf, 511, "You have been banned for %s spamming. Please do not spam.", reason);
+ std::string anotherbuf = STRPRINTF("You have been banned for %s spamming. Please do not spam.",
+ 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);
+ 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
-int tmw_ShorterStrlen (const char *s1, const char *s2)
+int tmw_ShorterStrlen(const char *s1, const char *s2)
{
- int s1_len = strlen (s1);
- int s2_len = strlen (s2);
+ int s1_len = strlen(s1);
+ int s2_len = strlen(s2);
return (s2_len >= s1_len ? s1_len : s2_len);
}
// Returns true if more than 50% of input message is caps or punctuation
-int tmw_CheckChatLameness (struct map_session_data *sd, const char *message)
+int tmw_CheckChatLameness(struct map_session_data *, const char *message)
{
- int count, lame;
+ int count, lame;
for (count = lame = 0; *message; message++, count++)
- if (isupper (*message) || ispunct (*message))
+ if (isupper(*message) || ispunct(*message))
lame++;
if (count > 7 && lame > count / 2)
@@ -141,26 +135,15 @@ int tmw_CheckChatLameness (struct map_session_data *sd, const char *message)
}
// Sends a whisper to all GMs
-void tmw_GmHackMsg (const char *fmt, ...)
+void tmw_GmHackMsg(const_string line)
{
- char buf[512];
- va_list ap;
-
- va_start (ap, fmt);
- vsnprintf (buf, 511, fmt, ap);
- va_end (ap);
-
- char outbuf[512 + 5];
- strcpy (outbuf, "[GM] ");
- strcat (outbuf, buf);
-
- intif_wis_message_to_gm (wisp_server_name,
- battle_config.hack_info_GM_level, outbuf,
- strlen (outbuf) + 1);
+ intif_wis_message_to_gm(wisp_server_name,
+ battle_config.hack_info_GM_level,
+ line.data(), line.size() + 1);
}
/* Remove leading and trailing spaces from a string, modifying in place. */
-void tmw_TrimStr (char *str)
+void tmw_TrimStr(char *str)
{
char *l;
char *a;
@@ -169,16 +152,16 @@ void tmw_TrimStr (char *str)
if (!*str)
return;
- e = str + strlen (str) - 1;
+ e = str + strlen(str) - 1;
/* Skip all leading spaces. */
- for (l = str; *l && isspace (*l); ++l)
+ for (l = str; *l && isspace(*l); ++l)
;
/* Find the end of the string, or the start of trailing spaces. */
- for (a = e; *a && a > l && isspace (*a); --a)
+ for (a = e; *a && a > l && isspace(*a); --a)
;
- memmove (str, l, a - l + 1);
+ memmove(str, l, a - l + 1);
str[a - l + 1] = '\0';
}
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-30 19:15:50 +0000