From 8cd6cfab594fb2f93ae655509b5f1399cfa34089 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 7 Mar 2015 16:55:42 +0100
Subject: Split "ToME options" out into options.{cc,hpp}

---
 src/birth.cc    |  1 +
 src/externs.h   |  5 -----
 src/help.cc     |  1 +
 src/options.cc  | 11 +++++++++++
 src/options.hpp |  9 +++++++++
 src/variable.cc | 26 --------------------------
 6 files changed, 22 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/birth.cc b/src/birth.cc
index c3d0f3a6..3d99258e 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -25,6 +25,7 @@
 #include "notes.hpp"
 #include "object1.hpp"
 #include "object2.hpp"
+#include "options.hpp"
 #include "q_rand.h"
 #include "skills.hpp"
 #include "spells2.hpp"
diff --git a/src/externs.h b/src/externs.h
index a718f63b..766d87e5 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -269,7 +269,6 @@ extern bool_ generate_encounter;
 extern bool_ autoroll;
 extern bool_ point_based;
 extern bool_ preserve, special_lvls, ironman_rooms;
-extern bool_ inventory_no_move;
 extern bool_ *m_allow_special;
 extern bool_ *k_allow_special;
 extern bool_ *a_allow_special;
@@ -280,13 +279,11 @@ extern random_quest random_quests[MAX_RANDOM_QUEST];
 extern bool_ fate_option;
 extern bool_ *special_lvl[MAX_DUNGEON_DEPTH];
 extern bool_ generate_special_feeling;
-extern bool_ auto_more;
 extern u32b dungeon_flags1;
 extern u32b dungeon_flags2;
 extern birther previous_char;
 extern hist_type *bg;
 extern int max_bg_idx;
-extern bool_ player_char_health;
 extern s16b schools_count;
 extern school_type schools[SCHOOLS_MAX];
 extern int project_time;
@@ -296,9 +293,7 @@ extern char gen_skill_basem[MAX_SKILLS];
 extern u32b gen_skill_base[MAX_SKILLS];
 extern char gen_skill_modm[MAX_SKILLS];
 extern s16b gen_skill_mod[MAX_SKILLS];
-extern bool_ linear_stats;
 extern int max_bact;
-extern bool_ option_ingame_help;
 extern bool_ automatizer_enabled;
 extern s16b last_teleportation_y;
 extern s16b last_teleportation_x;
diff --git a/src/help.cc b/src/help.cc
index e20808bf..f7a8378b 100644
--- a/src/help.cc
+++ b/src/help.cc
@@ -13,6 +13,7 @@
 #include "files.hpp"
 #include "hooks.h"
 #include "object1.hpp"
+#include "options.hpp"
 #include "skills.hpp"
 #include "util.hpp"
 
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 */
diff --git a/src/options.hpp b/src/options.hpp
index 1d79f5f8..fd68e163 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -69,3 +69,12 @@ extern bool_ view_yellow_lite;
 extern bool_ view_bright_lite;
 extern bool_ view_granite_lite;
 extern bool_ view_special_lite;
+
+//
+// Option Set 5 - ToME options
+//
+extern bool_ linear_stats;
+extern bool_ player_char_health;
+extern bool_ option_ingame_help;
+extern bool_ auto_more;
+extern bool_ inventory_no_move;
diff --git a/src/variable.cc b/src/variable.cc
index d102c1da..f9bdbc96 100644
--- a/src/variable.cc
+++ b/src/variable.cc
@@ -951,11 +951,6 @@ bool_ point_based;
 /* Preserve, special levels, ironman_rooms */
 bool_ preserve, special_lvls, ironman_rooms;
 
-/* In inventory option window, just erase the letters,
- * rather that displaying the list without the invalid
- * selections */
-bool_ inventory_no_move;
-
 /*
  * Such an ugly hack ...
  */
@@ -994,11 +989,6 @@ bool_ fate_option;
 bool_ *special_lvl[MAX_DUNGEON_DEPTH];
 bool_ generate_special_feeling = FALSE;
 
-/*
- * Auto more
- */
-bool_ auto_more;
-
 /*
  * Dungeon flags
  */
@@ -1016,12 +1006,6 @@ birther previous_char;
 hist_type *bg;
 int max_bg_idx;
 
-/*
- * Display the player as a special symbol when in bad health ?
- */
-bool_ player_char_health;
-
-
 /*
  * The spell list of schools
  */
@@ -1043,11 +1027,6 @@ u32b gen_skill_base[MAX_SKILLS];
 char gen_skill_modm[MAX_SKILLS];
 s16b gen_skill_mod[MAX_SKILLS];
 
-/*
- * Display stats as linear
- */
-bool_ linear_stats;
-
 /*
  * Table of "cli" macros.
  */
@@ -1059,11 +1038,6 @@ int cli_total = 0;
  */
 int max_bact = 127;
 
-/*
- * Ingame contextual help
- */
-bool_ option_ingame_help = TRUE;
-
 /*
  * Automatizer enabled status
  */
-- 
cgit v1.2.3