summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-19 17:23:22 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-19 17:23:22 +0000
commit8b397b940a270a4e4107f76614339742a8c5a257 (patch)
treefec95c260beb58669be760396a3eb0241ba9dfa4 /src/map/battle.c
parent9f1bd225974beb0a09495a0b28c1e0deec27de7d (diff)
downloadhercules-8b397b940a270a4e4107f76614339742a8c5a257.tar.gz
hercules-8b397b940a270a4e4107f76614339742a8c5a257.tar.bz2
hercules-8b397b940a270a4e4107f76614339742a8c5a257.tar.xz
hercules-8b397b940a270a4e4107f76614339742a8c5a257.zip
- Made the report_Src function also report name of non-bl objects.
- The double continuation error will now display both scripts that triggered it. - Loading the storage from the char-server will fail if player is already tagged in final save state. - Removed setting ban_spoof_namer, sending invalid global-talk packets will now just kick the player out of the server. - Added BL_NPC support to status_get_name git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8812 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index f9590a50c..68297b7ff 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3682,7 +3682,6 @@ static const struct battle_data_short {
{ "backstab_bow_penalty", &battle_config.backstab_bow_penalty },
{ "night_at_start", &battle_config.night_at_start }, // added by [Yor]
{ "show_mob_info", &battle_config.show_mob_info }, // [Valaris]
- { "ban_spoof_namer", &battle_config.ban_spoof_namer }, // added by [Yor]
{ "hack_info_GM_level", &battle_config.hack_info_GM_level }, // added by [Yor]
{ "any_warp_GM_min_level", &battle_config.any_warp_GM_min_level }, // added by [Yor]
{ "packet_ver_flag", &battle_config.packet_ver_flag }, // added by [Yor]
@@ -4118,7 +4117,6 @@ void battle_set_defaults() {
battle_config.day_duration = 2*60*60*1000; // added by [Yor] (2 hours)
battle_config.night_duration = 30*60*1000; // added by [Yor] (30 minutes)
battle_config.show_mob_info = 0;
- battle_config.ban_spoof_namer = 5; // added by [Yor] (default: 5 minutes)
battle_config.hack_info_GM_level = 60; // added by [Yor] (default: 60, GM level)
battle_config.any_warp_GM_min_level = 20; // added by [Yor]
battle_config.packet_ver_flag = 1023; // added by [Yor]
@@ -4339,9 +4337,6 @@ void battle_validate_conf() {
if (battle_config.night_duration != 0 && battle_config.night_duration < 60000) // added by [Yor]
battle_config.night_duration = 60000;
- if (battle_config.ban_spoof_namer > SHRT_MAX)
- battle_config.ban_spoof_namer = SHRT_MAX;
-
if (battle_config.hack_info_GM_level > 100)
battle_config.hack_info_GM_level = 100;