summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-25 15:08:26 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-25 15:08:26 +0000
commit18f01d4f113b8ac7430946688292011c5fc3c2fb (patch)
treeb76f7c16e46fc00e717299a2bb178af735b34a94
parent38b486e1074537b27f6c523b3f79d47128dfcdf6 (diff)
downloadhercules-18f01d4f113b8ac7430946688292011c5fc3c2fb.tar.gz
hercules-18f01d4f113b8ac7430946688292011c5fc3c2fb.tar.bz2
hercules-18f01d4f113b8ac7430946688292011c5fc3c2fb.tar.xz
hercules-18f01d4f113b8ac7430946688292011c5fc3c2fb.zip
- Removed config setting allow_atcommand_when_mute as it's no longer used (see manner_system in misc.conf for it's replacement)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8860 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--conf-tmpl/Changelog.txt3
-rw-r--r--conf-tmpl/battle/gm.conf3
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/battle.h1
-rw-r--r--src/map/clif.c1
-rw-r--r--src/map/status.c2
6 files changed, 3 insertions, 9 deletions
diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index add9ff445..ca930252b 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,5 +1,8 @@
Date Added
+2006/09/25
+ * Removed config setting allow_atcommand_when_mute as it's no longer used
+ (see manner_system in misc.conf for it's replacement) [Skotlex]
2006/09/19
* Removed setting ban_spoof_namer (as now invalid chat packets just cause
the sending character to be disconnected). [Skotlex]
diff --git a/conf-tmpl/battle/gm.conf b/conf-tmpl/battle/gm.conf
index cbc25e212..9f627571c 100644
--- a/conf-tmpl/battle/gm.conf
+++ b/conf-tmpl/battle/gm.conf
@@ -82,9 +82,6 @@ hack_info_GM_level: 60
// default: 20 (first level after normal player or super'normal' player)
any_warp_GM_min_level: 20
-// Allow GM commands to be used when muted?
-allow_atcommand_when_mute: yes
-
// The minimum level for a GM to be unable to distribyte items.
// You should set this to the same level @item is set to in the atcommand.conf
// NEVER SET THIS VALUE TO 0, or you will block drop/trade for normal players
diff --git a/src/map/battle.c b/src/map/battle.c
index 68297b7ff..6d000c46b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3703,7 +3703,6 @@ static const struct battle_data_short {
{ "skill_steal_max_tries", &battle_config.skill_steal_max_tries}, // [Lupus]
// { "night_darkness_level", &battle_config.night_darkness_level}, // [celest]
{ "motd_type", &battle_config.motd_type}, // [celest]
- { "allow_atcommand_when_mute", &battle_config.allow_atcommand_when_mute}, // [celest]
{ "finding_ore_rate", &battle_config.finding_ore_rate}, // [celest]
{ "exp_calc_type", &battle_config.exp_calc_type}, // [celest]
{ "min_skill_delay_limit", &battle_config.min_skill_delay_limit}, // [celest]
@@ -4136,7 +4135,6 @@ void battle_set_defaults() {
battle_config.skill_steal_max_tries = 15; //=16 tries
// battle_config.night_darkness_level = 9;
battle_config.motd_type = 0;
- battle_config.allow_atcommand_when_mute = 0;
battle_config.finding_ore_rate = 100;
battle_config.castrate_dex_scale = 150;
battle_config.area_size = 14;
diff --git a/src/map/battle.h b/src/map/battle.h
index 8e9dc1010..a4acd4538 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -358,7 +358,6 @@ extern struct Battle_Config {
unsigned short skill_steal_max_tries; //max steal skill tries on a mob. if=256, then w/o limit [Lupus]
// unsigned short night_darkness_level; // [celest]
unsigned short motd_type; // [celest]
- unsigned short allow_atcommand_when_mute; // [celest]
unsigned short finding_ore_rate; // orn
unsigned short exp_calc_type;
unsigned short min_skill_delay_limit;
diff --git a/src/map/clif.c b/src/map/clif.c
index 538c4aab4..14b3a06b1 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7853,7 +7853,6 @@ int clif_charnameack (int fd, struct block_list *bl)
if (battle_config.show_mob_info&1)
str_p += sprintf(str_p, "HP: %u/%u | ", md->status.hp, md->status.max_hp);
if (battle_config.show_mob_info&2)
-
str_p += sprintf(str_p, "HP: %d%% | ",
md->status.max_hp > 10000?
md->status.hp/(md->status.max_hp/100):
diff --git a/src/map/status.c b/src/map/status.c
index 8579dc9e3..ab81d41ac 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4474,8 +4474,6 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
if (!(rand()%10000 < rate))
return 0;
-
-
}
undead_flag=battle_check_undead(status->race,status->def_ele);