summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadCamel <madcamel@gmail.com>2010-09-16 12:39:43 -0400
committerMadCamel <madcamel@gmail.com>2010-09-16 12:39:43 -0400
commitbc8df6622b7f7b2129eab428a98ae5b5ab7bb7dc (patch)
treea08821c8585a8e6e3b10a0d89366fc68c70fa573
parent2864134d79c5a176e570b54fe58974a3bec87eff (diff)
downloadtmwa-bc8df6622b7f7b2129eab428a98ae5b5ab7bb7dc.tar.gz
tmwa-bc8df6622b7f7b2129eab428a98ae5b5ab7bb7dc.tar.bz2
tmwa-bc8df6622b7f7b2129eab428a98ae5b5ab7bb7dc.tar.xz
tmwa-bc8df6622b7f7b2129eab428a98ae5b5ab7bb7dc.zip
Removed configuration vars for trade and sit spam
Guess I forgot to remove them when the actual trade/sit spam code was removed.
-rw-r--r--src/map/battle.c66
-rw-r--r--src/map/battle.h10
2 files changed, 0 insertions, 76 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 4ec942f..ea284a5 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5653,16 +5653,6 @@ int battle_config_read (const char *cfgName)
battle_config.chat_spam_warn = 8;
battle_config.chat_maxline = 255;
- battle_config.trade_spam_threshold = 10;
- battle_config.trade_spam_flood = 10;
- battle_config.trade_spam_ban = 0;
- battle_config.trade_spam_warn = 8;
-
- battle_config.sit_spam_threshold = 1;
- battle_config.sit_spam_flood = 15;
- battle_config.sit_spam_ban = 0;
- battle_config.sit_spam_warn = 3;
-
battle_config.packet_spam_threshold = 2;
battle_config.packet_spam_flood = 30;
battle_config.packet_spam_kick = 1;
@@ -6113,22 +6103,6 @@ int battle_config_read (const char *cfgName)
{
"chat_maxline", &battle_config.chat_maxline},
{
- "trade_spam_threshold", &battle_config.trade_spam_threshold},
- {
- "trade_spam_flood", &battle_config.trade_spam_flood},
- {
- "trade_spam_ban", &battle_config.trade_spam_ban},
- {
- "trade_spam_warn", &battle_config.trade_spam_warn},
- {
- "sit_spam_threshold", &battle_config.sit_spam_threshold},
- {
- "sit_spam_flood", &battle_config.sit_spam_flood},
- {
- "sit_spam_ban", &battle_config.sit_spam_ban},
- {
- "sit_spam_warn", &battle_config.sit_spam_warn},
- {
"packet_spam_threshold", &battle_config.packet_spam_threshold},
{
"packet_spam_flood", &battle_config.packet_spam_flood},
@@ -6275,46 +6249,6 @@ int battle_config_read (const char *cfgName)
else if (battle_config.chat_maxline > 512)
battle_config.chat_maxline = 512;
- if (battle_config.trade_spam_ban < 0)
- battle_config.trade_spam_ban = 0;
- else if (battle_config.trade_spam_ban > 32767)
- battle_config.trade_spam_ban = 32767;
-
- if (battle_config.trade_spam_flood < 0)
- battle_config.trade_spam_flood = 0;
- else if (battle_config.trade_spam_flood > 32767)
- battle_config.trade_spam_flood = 32767;
-
- if (battle_config.trade_spam_warn < 0)
- battle_config.trade_spam_warn = 0;
- else if (battle_config.trade_spam_warn > 32767)
- battle_config.trade_spam_warn = 32767;
-
- if (battle_config.trade_spam_threshold < 0)
- battle_config.trade_spam_threshold = 0;
- else if (battle_config.trade_spam_threshold > 32767)
- battle_config.trade_spam_threshold = 32767;
-
- if (battle_config.sit_spam_ban < 0)
- battle_config.sit_spam_ban = 0;
- else if (battle_config.sit_spam_ban > 32767)
- battle_config.sit_spam_ban = 32767;
-
- if (battle_config.sit_spam_flood < 0)
- battle_config.sit_spam_flood = 0;
- else if (battle_config.sit_spam_flood > 32767)
- battle_config.sit_spam_flood = 32767;
-
- if (battle_config.sit_spam_warn < 0)
- battle_config.sit_spam_warn = 0;
- else if (battle_config.sit_spam_warn > 32767)
- battle_config.sit_spam_warn = 32767;
-
- if (battle_config.sit_spam_threshold < 0)
- battle_config.sit_spam_threshold = 0;
- else if (battle_config.sit_spam_threshold > 32767)
- battle_config.sit_spam_threshold = 32767;
-
if (battle_config.packet_spam_threshold < 0)
battle_config.packet_spam_threshold = 0;
else if (battle_config.packet_spam_threshold > 32767)
diff --git a/src/map/battle.h b/src/map/battle.h
index 9862df6..b155109 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -340,16 +340,6 @@ extern struct Battle_Config
int chat_spam_warn;
int chat_maxline;
- int trade_spam_threshold;
- int trade_spam_flood;
- int trade_spam_ban;
- int trade_spam_warn;
-
- int sit_spam_threshold;
- int sit_spam_flood;
- int sit_spam_ban;
- int sit_spam_warn;
-
int packet_spam_threshold;
int packet_spam_flood;
int packet_spam_kick;