From 72ceb4f2aba3b86be43ba9a7cb5c576b79920543 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 7 Mar 2015 16:55:41 +0100 Subject: Split option variables into separate header and source file Remove unused testing_stack testing_carry options while we're at it. --- src/options.cc | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 src/options.cc (limited to 'src/options.cc') diff --git a/src/options.cc b/src/options.cc new file mode 100644 index 00000000..d3feb7b2 --- /dev/null +++ b/src/options.cc @@ -0,0 +1,69 @@ +#include "options.hpp" + +// +// Option Set 1 -- User Interface +// +bool_ rogue_like_commands; /* Rogue-like commands */ +bool_ quick_messages; /* Activate quick messages */ +bool_ carry_query_flag; /* Prompt before picking things up */ +bool_ use_old_target; /* Use old target by default */ +bool_ always_pickup; /* Pick things up by default */ +bool_ prompt_pickup_heavy; /* Don't pick up the corpses */ +bool_ always_repeat; /* Repeat obvious commands */ +bool_ ring_bell; /* Ring the bell (on errors, etc) */ + +// +// Option Set 2 -- Disturbance +// +bool_ find_ignore_stairs; /* Run past stairs */ +bool_ find_ignore_doors; /* Run through open doors */ +bool_ find_cut; /* Run past known corners */ +bool_ find_examine; /* Run into potential corners */ +bool_ disturb_move; /* Disturb whenever any monster moves */ +bool_ disturb_near; /* Disturb whenever viewable monster moves */ +bool_ disturb_panel; /* Disturb whenever map panel changes */ +bool_ disturb_detect; /* Disturb whenever leaving trap-detected area */ +bool_ disturb_state; /* Disturn whenever player state changes */ +bool_ disturb_minor; /* Disturb whenever boring things happen */ +bool_ disturb_other; /* Disturb whenever various things happen */ +bool_ alert_hitpoint; /* Alert user to critical hitpoints */ +bool_ alert_failure; /* Alert user to various failures */ +bool_ last_words; /* Get last words upon dying */ +bool_ small_levels; /* Allow unusually small dungeon levels */ +bool_ empty_levels; /* Allow empty 'arena' levels */ +bool_ always_small_level; /* Small levels */ +bool_ confirm_stairs; /* Prompt before staircases... */ +bool_ wear_confirm; /* Confirm before putting on known cursed items */ +bool_ disturb_pets; /* Pets moving nearby disturb us */ + +// +// Option Set 3 -- Game-Play +// +bool_ auto_scum; /* Auto-scum for good levels */ +bool_ expand_look; /* Expand the power of the look command */ +bool_ expand_list; /* Expand the power of the list commands */ +bool_ view_perma_grids; /* Map remembers all perma-lit grids */ +bool_ view_torch_grids; /* Map remembers all torch-lit grids */ +bool_ dungeon_align; /* Generate dungeons with aligned rooms */ +bool_ dungeon_stair; /* Generate dungeons with connected stairs */ +bool_ flow_by_sound; /* Monsters track new player location */ +bool_ smart_learn; /* Monsters learn from their mistakes */ + +// +// Option Set 4 -- Efficiency +// +bool_ view_reduce_lite; /* Reduce lite-radius when running */ +bool_ avoid_abort; /* Avoid checking for user abort */ +bool_ avoid_shimmer; /* Avoid processing extra shimmering */ +bool_ avoid_other; /* Avoid processing special colors */ +bool_ flush_failure; /* Flush input on any failure */ +bool_ flush_disturb; /* Flush input on disturbance */ +bool_ flush_command; /* Flush input before every command */ +bool_ fresh_before; /* Flush output before normal commands */ +bool_ fresh_after; /* Flush output after normal commands */ +bool_ fresh_message; /* Flush output after all messages */ +bool_ hilite_player; /* Hilite the player with the cursor */ +bool_ view_yellow_lite; /* Use special colors for torch-lit grids */ +bool_ view_bright_lite; /* Use special colors for 'viewable' grids */ +bool_ view_granite_lite; /* Use special colors for wall grids (slow) */ +bool_ view_special_lite; /* Use special colors for floor grids (slow) */ -- cgit v1.2.3 From 8cd6cfab594fb2f93ae655509b5f1399cfa34089 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 7 Mar 2015 16:55:42 +0100 Subject: Split "ToME options" out into options.{cc,hpp} --- src/options.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/options.cc') diff --git a/src/options.cc b/src/options.cc index d3feb7b2..095df037 100644 --- a/src/options.cc +++ b/src/options.cc @@ -67,3 +67,14 @@ bool_ view_yellow_lite; /* Use special colors for torch-lit grids */ bool_ view_bright_lite; /* Use special colors for 'viewable' grids */ bool_ view_granite_lite; /* Use special colors for wall grids (slow) */ bool_ view_special_lite; /* Use special colors for floor grids (slow) */ + +// +// Option Set 5 - ToME options +// +bool_ linear_stats; +bool_ player_char_health; /* Display the player as a special symbol when in bad health ? */ +bool_ option_ingame_help; /* Ingame contextual help */ +bool_ auto_more; /* Auto more */ +bool_ inventory_no_move; /* In inventory option window, just erase the letters, + * rather that displaying the list without the invalid + * selections */ -- cgit v1.2.3 From 50a8089bb44ffeb21b9f8bca2c3b6596b617e0d0 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 7 Mar 2015 16:55:42 +0100 Subject: Move "Birth options" to options.{cc,hpp} --- src/options.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/options.cc') diff --git a/src/options.cc b/src/options.cc index 095df037..7acea8ce 100644 --- a/src/options.cc +++ b/src/options.cc @@ -31,7 +31,6 @@ bool_ alert_failure; /* Alert user to various failures */ bool_ last_words; /* Get last words upon dying */ bool_ small_levels; /* Allow unusually small dungeon levels */ bool_ empty_levels; /* Allow empty 'arena' levels */ -bool_ always_small_level; /* Small levels */ bool_ confirm_stairs; /* Prompt before staircases... */ bool_ wear_confirm; /* Confirm before putting on known cursed items */ bool_ disturb_pets; /* Pets moving nearby disturb us */ @@ -78,3 +77,14 @@ bool_ auto_more; /* Auto more */ bool_ inventory_no_move; /* In inventory option window, just erase the letters, * rather that displaying the list without the invalid * selections */ + +// +// Option Set 6 - Birth options +// +bool_ always_small_level; +bool_ autoroll; +bool_ fate_option; +bool_ ironman_rooms; +bool_ joke_monsters; +bool_ point_based; +bool_ preserve; -- cgit v1.2.3 From 6f612c6e6cf9b20c00fd2f515d3694d2b7f7f444 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 7 Mar 2015 16:55:42 +0100 Subject: Split variables.cc declarations to separate header files - Can now remove externs.h. Yay! - Put a stray option variable into its rightful place in options.hpp --- src/options.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'src/options.cc') diff --git a/src/options.cc b/src/options.cc index 7acea8ce..490b0245 100644 --- a/src/options.cc +++ b/src/options.cc @@ -66,6 +66,7 @@ bool_ view_yellow_lite; /* Use special colors for torch-lit grids */ bool_ view_bright_lite; /* Use special colors for 'viewable' grids */ bool_ view_granite_lite; /* Use special colors for wall grids (slow) */ bool_ view_special_lite; /* Use special colors for floor grids (slow) */ +bool_ center_player; /* Center view on player */ // // Option Set 5 - ToME options -- cgit v1.2.3 From 0a66e1537dc7bb5500d7bf2203144ea44b167f45 Mon Sep 17 00:00:00 2001 From: miramor Date: Sun, 22 Mar 2015 14:18:10 -0400 Subject: Add a no-selling birth option --- src/options.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'src/options.cc') diff --git a/src/options.cc b/src/options.cc index 490b0245..0e3df5d0 100644 --- a/src/options.cc +++ b/src/options.cc @@ -89,3 +89,4 @@ bool_ ironman_rooms; bool_ joke_monsters; bool_ point_based; bool_ preserve; +bool_ no_selling; -- cgit v1.2.3 From 82936c32458b8d8312a4fdfce8b2d8274f493872 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sun, 7 Jun 2015 17:49:09 +0200 Subject: Remove prompt_pickup_heavy option; behave as if always set --- src/options.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'src/options.cc') diff --git a/src/options.cc b/src/options.cc index 0e3df5d0..1a12fc56 100644 --- a/src/options.cc +++ b/src/options.cc @@ -8,7 +8,6 @@ bool_ quick_messages; /* Activate quick messages */ bool_ carry_query_flag; /* Prompt before picking things up */ bool_ use_old_target; /* Use old target by default */ bool_ always_pickup; /* Pick things up by default */ -bool_ prompt_pickup_heavy; /* Don't pick up the corpses */ bool_ always_repeat; /* Repeat obvious commands */ bool_ ring_bell; /* Ring the bell (on errors, etc) */ -- cgit v1.2.3 From 4cdbbd83d0030f6fa21e339dbd2d9b65604882e1 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sun, 7 Jun 2015 17:49:09 +0200 Subject: Remove expand_{list,look} options; behave as if always set --- src/options.cc | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/options.cc') diff --git a/src/options.cc b/src/options.cc index 1a12fc56..5501ab52 100644 --- a/src/options.cc +++ b/src/options.cc @@ -38,8 +38,6 @@ bool_ disturb_pets; /* Pets moving nearby disturb us */ // Option Set 3 -- Game-Play // bool_ auto_scum; /* Auto-scum for good levels */ -bool_ expand_look; /* Expand the power of the look command */ -bool_ expand_list; /* Expand the power of the list commands */ bool_ view_perma_grids; /* Map remembers all perma-lit grids */ bool_ view_torch_grids; /* Map remembers all torch-lit grids */ bool_ dungeon_align; /* Generate dungeons with aligned rooms */ -- cgit v1.2.3