From 069f39e8a1ebee3e4a4ce8302d0099842876782b Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 13 Dec 2012 16:25:50 -0800 Subject: Some formatting fixes before I go insane Also delete the French translation from ladmin. --- src/map/tmw.cpp | 75 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 38 deletions(-) (limited to 'src/map/tmw.cpp') diff --git a/src/map/tmw.cpp b/src/map/tmw.cpp index 8c4f7fe..d648490 100644 --- a/src/map/tmw.cpp +++ b/src/map/tmw.cpp @@ -29,12 +29,12 @@ #include "storage.hpp" #include "trade.hpp" -int tmw_CheckChatSpam (struct map_session_data *sd, const char *message) +int tmw_CheckChatSpam(struct map_session_data *sd, const char *message) { - nullpo_retr (1, sd); - time_t now = time (NULL); + nullpo_retr(1, sd); + time_t now = time(NULL); - if (pc_isGM (sd)) + if (pc_isGM(sd)) return 0; if (now > sd->chat_reset_due) @@ -53,9 +53,8 @@ int tmw_CheckChatSpam (struct map_session_data *sd, const char *message) 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++; @@ -66,17 +65,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; } @@ -85,8 +84,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; @@ -101,36 +100,36 @@ void tmw_AutoBan(struct map_session_data *sd, const char *reason, int length) sd->auto_ban_info.in_progress = 1; - tmw_GmHackMsg ("%s has been autobanned for %s spam", + tmw_GmHackMsg("%s has been autobanned for %s spam", sd->status.name, reason); - gm_log ("%s(%d,%d) Server : @autoban %s %dh (%s spam)", + 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); + snprintf(anotherbuf, 511, "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 *sd, 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) @@ -140,26 +139,26 @@ 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 char *fmt, ...) { char buf[512]; va_list ap; - va_start (ap, fmt); - vsnprintf (buf, 511, fmt, ap); - va_end (ap); + va_start(ap, fmt); + vsnprintf(buf, 511, fmt, ap); + va_end(ap); char outbuf[512 + 5]; - strcpy (outbuf, "[GM] "); - strcat (outbuf, buf); + strcpy(outbuf, "[GM] "); + strcat(outbuf, buf); - intif_wis_message_to_gm (wisp_server_name, + intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, outbuf, - strlen (outbuf) + 1); + strlen(outbuf) + 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; @@ -168,16 +167,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'; } -- cgit v1.2.3-60-g2f50