Move non-boolean options to options.cc too

6 files changed, 37 insertions, 37 deletions

diff --git a/src/cmd4.cc b/src/cmd4.cc
index b8a92ddd..0d15e0b8 100644
--- a/src/cmd4.cc
+++ b/src/cmd4.cc
@@ -27,6 +27,7 @@
 #include "object2.hpp"
 #include "object_flag.hpp"
 #include "object_kind.hpp"
+#include "options.hpp"
 #include "player_type.hpp"
 #include "skills.hpp"
 #include "squeltch.hpp"
diff --git a/src/loadsave.cc b/src/loadsave.cc
index 1c1bb161..aa2ca5a6 100644
--- a/src/loadsave.cc
+++ b/src/loadsave.cc
@@ -18,6 +18,7 @@
 #include "object1.hpp"
 #include "object2.hpp"
 #include "object_kind.hpp"
+#include "options.hpp"
 #include "player_class.hpp"
 #include "player_level_flag.hpp"
 #include "player_race.hpp"
diff --git a/src/options.cc b/src/options.cc
index e4acaab4..1b0baccf 100644
--- a/src/options.cc
+++ b/src/options.cc
@@ -82,3 +82,21 @@ bool_ joke_monsters;
 bool_ point_based;
 bool_ preserve;
 bool_ no_selling;
+
+//
+// Other options
+//
+
+bool_ cheat_peek;                      /* Peek into object creation */
+bool_ cheat_hear;                      /* Peek into monster creation */
+bool_ cheat_room;                      /* Peek into dungeon creation */
+bool_ cheat_xtra;                      /* Peek into something else */
+bool_ cheat_live;                      /* Allow player to avoid death */
+
+byte hitpoint_warn;                    /* Hitpoint warning (0 to 9) */
+
+byte delay_factor;                     /* Delay factor (0 to 9) */
+
+s16b autosave_freq;                    /* Autosave frequency */
+bool_ autosave_t;                      /* Timed autosave */
+bool_ autosave_l;                      /* Autosave before entering new levels */
diff --git a/src/options.hpp b/src/options.hpp
index 80e5cca7..940f9a6c 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -84,3 +84,20 @@ extern bool_ joke_monsters;
 extern bool_ point_based;
 extern bool_ preserve;
 extern bool_ no_selling;
+
+//
+// Other options
+//
+extern bool_ cheat_peek;
+extern bool_ cheat_hear;
+extern bool_ cheat_room;
+extern bool_ cheat_xtra;
+extern bool_ cheat_live;
+
+extern byte hitpoint_warn;
+
+extern byte delay_factor;
+
+extern s16b autosave_freq;
+extern bool_ autosave_t;
+extern bool_ autosave_l;
diff --git a/src/variable.cc b/src/variable.cc
index a0e075b3..fd8ccd40 100644
--- a/src/variable.cc
+++ b/src/variable.cc
@@ -143,33 +143,6 @@ int text_out_indent = 0;
 
 
 /*
- * Software options (set via the '=' command).  See "tables.c"
- */
-
-
-
-
-/* Cheating options */
-
-bool_ cheat_peek; 		/* Peek into object creation */
-bool_ cheat_hear; 		/* Peek into monster creation */
-bool_ cheat_room; 		/* Peek into dungeon creation */
-bool_ cheat_xtra; 		/* Peek into something else */
-bool_ cheat_live; 		/* Allow player to avoid death */
-
-
-/* Special options */
-
-byte hitpoint_warn; 		/* Hitpoint warning (0 to 9) */
-
-byte delay_factor; 		/* Delay factor (0 to 9) */
-
-bool_ autosave_l;         /* Autosave before entering new levels */
-bool_ autosave_t;         /* Timed autosave */
-s16b autosave_freq;      /* Autosave frequency */
-
-
-/*
  * Dungeon variables
  */
 
diff --git a/src/variable.hpp b/src/variable.hpp
index 6b1b53ef..854b88c0 100644
--- a/src/variable.hpp
+++ b/src/variable.hpp
@@ -109,16 +109,6 @@ extern int artifact_bias;
 extern FILE *text_out_file;
 extern void (*text_out_hook)(byte a, cptr str);
 extern int text_out_indent;
-extern bool_ cheat_peek;
-extern bool_ cheat_hear;
-extern bool_ cheat_room;
-extern bool_ cheat_xtra;
-extern bool_ cheat_live;
-extern byte hitpoint_warn;
-extern byte delay_factor;
-extern s16b autosave_freq;
-extern bool_ autosave_t;
-extern bool_ autosave_l;
 extern s16b feeling;
 extern s16b rating;
 extern bool_ good_item_flag;