Selaa lähdekoodia

* Fixed 'feature.conf' not getting loaded and a typo buying store feature setting name (follow up to r14713).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14714 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 14 vuotta sitten
vanhempi
commit
50eab8f576
3 muutettua tiedostoa jossa 5 lisäystä ja 1 poistoa
  1. 1 0
      Changelog-Trunk.txt
  2. 3 0
      conf/battle_athena.conf
  3. 1 1
      src/map/battle.c

+ 1 - 0
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'.

+ 3 - 0
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

+ 1 - 1
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,        },