Merge commit 'refs/merge-requests/2' of git://gitorious.org/tmw-eathena/mainline

1 files changed, 0 insertions, 70 deletions

diff --git a/src/map/tmw.c b/src/map/tmw.c
index 7070331..46e02bc 100644
--- a/src/map/tmw.c
+++ b/src/map/tmw.c
@@ -96,76 +96,6 @@ int tmw_CheckChatSpam (struct map_session_data *sd, char *message)
     return 0;
 }
 
-int tmw_CheckTradeSpam (struct map_session_data *sd)
-{
-    nullpo_retr (1, sd);
-    time_t now = time (NULL);
-
-    if (pc_isGM (sd))
-        return 0;
-
-    if (now > sd->trade_reset_due)
-    {
-        sd->trade_reset_due = now + battle_config.trade_spam_threshold;
-        sd->trades_in = 0;
-    }
-
-    sd->trades_in++;
-
-    if (sd->trades_in >= battle_config.trade_spam_flood)
-    {
-        sd->trades_in = 0;
-
-	tmw_AutoBan(sd, "trade", battle_config.trade_spam_ban);
-
-        return 1;
-    }
-
-    if (battle_config.trade_spam_ban
-        && sd->trades_in >= battle_config.trade_spam_warn)
-    {
-        clif_displaymessage (sd->fd,
-                             "WARNING : You are about to be automaticly banned for trade spam!");
-    }
-
-    return 0;
-}
-
-int tmw_CheckSitSpam (struct map_session_data *sd)
-{
-    nullpo_retr (1, sd);
-    time_t now = time (NULL);
-
-    if (pc_isGM (sd))
-        return 0;
-
-    if (now > sd->sit_reset_due)
-    {
-        sd->sit_reset_due = now + battle_config.sit_spam_threshold;
-        sd->sits_in = 0;
-    }
-
-    sd->sits_in++;
-
-    if (sd->sits_in >= battle_config.sit_spam_flood)
-    {
-        sd->sits_in = 0;
-
-	tmw_AutoBan(sd, "sit", battle_config.sit_spam_ban);
-
-        return 1;
-    }
-
-    if (battle_config.sit_spam_ban
-        && sd->sits_in >= battle_config.sit_spam_warn)
-    {
-        clif_displaymessage (sd->fd,
-                             "WARNING : You are about to be automaticly banned for sit spam!");
-    }
-
-    return 0;
-}
-
 void tmw_AutoBan(struct map_session_data *sd, char *reason, int length)
 {
 	char anotherbuf[512];