summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorgammafunk <gammafunk@gmail.com>2014-05-26 05:21:20 -0500
committergammafunk <gammafunk@gmail.com>2014-05-26 22:45:16 -0500
commit55d1b512e3395f07e9341ce9eae5079b581b6894 (patch)
tree811704017046d8ed62335bd1c45d36476e0dea55 /crawl-ref/source/initfile.cc
parentb364f15f4eeff0e148b6fc026c01de1327254cd2 (diff)
downloadcrawl-ref-55d1b512e3395f07e9341ce9eae5079b581b6894.tar.gz
crawl-ref-55d1b512e3395f07e9341ce9eae5079b581b6894.zip
Remove player burden and carrying capacity
Item inventory weights (based on item mass) generally don't lead to meaningful decisions that justify the inventory juggling and interface problems that come from having burden states. The 52-slot limit is a better system for limiting inventory and providing inventory-related decisions because it's not so fine-grained and doesn't require the player to examine weights for each slot. Work is ongoing to improve the slot system by consolidating food types and handling strategic consumables in a different way.
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc16
1 files changed, 2 insertions, 14 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 93a55ce385..db47f66831 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -575,8 +575,8 @@ void game_options::set_default_activity_interrupts()
"interrupt_vampire_feed = interrupt_butcher",
"interrupt_multidrop = hp_loss, monster_attack, teleport, stat",
"interrupt_macro = interrupt_multidrop",
- "interrupt_travel = interrupt_butcher, statue, hungry, "
- "burden, hit_monster, sense_monster",
+ "interrupt_travel = interrupt_butcher, statue, hungry, hit_monster, "
+ "sense_monster",
"interrupt_run = interrupt_travel, message",
"interrupt_rest = interrupt_run, full_hp, full_mp",
@@ -800,7 +800,6 @@ void game_options::reset_options()
auto_switch = false;
suppress_startup_errors = false;
- show_inventory_weights = MB_MAYBE;
show_uncursed = true;
travel_open_doors = true;
easy_unequip = true;
@@ -816,7 +815,6 @@ void game_options::reset_options()
allow_self_target = CONFIRM_PROMPT;
hp_warning = 30;
magic_point_warning = 0;
- autopickup_no_burden = true;
skill_focus = SKM_FOCUS_ON;
user_note_prefix = "";
@@ -2616,15 +2614,6 @@ void game_options::read_option_line(const string &str, bool runscript)
else
report_error("Unknown show_god_gift value: %s\n", field.c_str());
}
- else if (key == "show_inventory_weights")
- {
- if (field == "yes" || field == "true")
- show_inventory_weights = MB_TRUE;
- else if (field == "no" || field == "false")
- show_inventory_weights = MB_FALSE;
- else
- show_inventory_weights = MB_MAYBE;
- }
else if (key == "fire_order")
set_fire_order(field, plus_equal, caret_equal);
#if !defined(DGAMELAUNCH) || defined(DGL_REMEMBER_NAME)
@@ -2657,7 +2646,6 @@ void game_options::read_option_line(const string &str, bool runscript)
macro_dir = field;
#endif
#endif
- else BOOL_OPTION(autopickup_no_burden);
#ifdef DGL_SIMPLE_MESSAGING
else BOOL_OPTION(messaging);
#endif