diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | conf/battle_athena.conf | 3 | ||||
| -rw-r--r-- | src/map/battle.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 8d361025d..2be1e042c 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2011/02/19 + * Fixed 'feature.conf' not getting loaded and a typo buying store feature setting name (follow up to r14713). [Ai4rei] * Implemented buying store system (aka. reverse vending, purchase shop) together with related skill and items, without NPCs. [Ai4rei] - For SQL apply upgrade_svn14713_log.sql to upgrade tables `picklog` and `zenylog`; for TXT no action is necessary. - Requires 2010-04-20aRagexeRE or later and can be disabled in 'conf/battle/feature.conf'. diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf index 7cf56ce1b..a867382a7 100644 --- a/conf/battle_athena.conf +++ b/conf/battle_athena.conf @@ -62,6 +62,9 @@ import: conf/battle/skill.conf //Status change related settings import: conf/battle/status.conf +//Feature control (on/off) settings +import: conf/battle/feature.conf + // Anything else that didn't fit anywhere else. // Includes duel, day/night, mute/manner, log settings. import: conf/battle/misc.conf diff --git a/src/map/battle.c b/src/map/battle.c index aebb93d56..26348700b 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4007,7 +4007,7 @@ static const struct _battle_data { { "client_reshuffle_dice", &battle_config.client_reshuffle_dice, 0, 0, 1, }, { "client_sort_storage", &battle_config.client_sort_storage, 0, 0, 1, }, { "gm_check_minlevel", &battle_config.gm_check_minlevel, 60, 0, 100, }, - { "feature_buying_store", &battle_config.feature_buying_store, 1, 0, 1, }, + { "feature.buying_store", &battle_config.feature_buying_store, 1, 0, 1, }, // BattleGround Settings { "bg_update_interval", &battle_config.bg_update_interval, 1000, 100, INT_MAX, }, { "bg_short_attack_damage_rate", &battle_config.bg_short_damage_rate, 80, 0, INT_MAX, }, |