summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-08-02 04:10:23 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-08-02 04:10:23 +0000
commit7af299d591f357471bc8447707a10de9ea5ae0e3 (patch)
tree3a42528f874f1da21ee8aaf552da82181c01bcf7 /src/map/battle.c
parent73b9ce7e5d16ef9c2aa639c8442dd8f15c615fca (diff)
downloadhercules-7af299d591f357471bc8447707a10de9ea5ae0e3.tar.gz
hercules-7af299d591f357471bc8447707a10de9ea5ae0e3.tar.bz2
hercules-7af299d591f357471bc8447707a10de9ea5ae0e3.tar.xz
hercules-7af299d591f357471bc8447707a10de9ea5ae0e3.zip
* Questlog code cleanup.
* Fixed range check of autospell and autospell2 using wrong target when it should be used on yourself. * Implemented official behavior of party_show_share_picker. * Restricted zones in 'item_noequip.txt' can now stack. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13987 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 478fdfbf0..63e2357f4 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3656,7 +3656,8 @@ static const struct _battle_data {
{ "vending_over_max", &battle_config.vending_over_max, 1, 0, 1, },
{ "show_steal_in_same_party", &battle_config.show_steal_in_same_party, 0, 0, 1, },
{ "party_hp_mode", &battle_config.party_hp_mode, 0, 0, 1, },
- { "show_party_share_picker", &battle_config.party_show_share_picker, 0, 0, 1, },
+ { "show_party_share_picker", &battle_config.party_show_share_picker, 1, 0, 1, },
+ { "show_picker.item_type", &battle_config.show_picker_item_type, 112, 0, INT_MAX, },
{ "party_update_interval", &battle_config.party_update_interval, 1000, 100, INT_MAX, },
{ "party_item_share_type", &battle_config.party_share_type, 0, 0, 1|2|3, },
{ "attack_attr_none", &battle_config.attack_attr_none, ~BL_PC, BL_NUL, BL_ALL, },