Move new-game enums to newgame.h.

2 files changed, 36 insertions, 37 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 8e20a3e7c5..a32613eb8e 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -802,35 +802,6 @@ enum confirm_level_type
     CONFIRM_ALL_EASY
 };
 
-enum death_knight_type
-{
-    DK_NO_SELECTION,
-    DK_NECROMANCY,
-    DK_YREDELEMNUL,
-    DK_RANDOM
-};
-
-enum startup_book_type
-{
-    SBT_NO_SELECTION = 0,
-    SBT_FIRE,
-    SBT_COLD,
-    SBT_SUMM,
-    SBT_RANDOM
-};
-
-enum startup_wand_type
-{
-    SWT_NO_SELECTION = 0,
-    SWT_ENSLAVEMENT,
-    SWT_CONFUSION,
-    SWT_MAGIC_DARTS,
-    SWT_FROST,
-    SWT_FLAME,
-    SWT_STRIKING, // actually a rod
-    SWT_RANDOM
-};
-
 // When adding new delays, update their names in delay.cc, or bad things will
 // happen.
 enum delay_type
diff --git a/crawl-ref/source/newgame.h b/crawl-ref/source/newgame.h
index 3333094a2a..4dc9446073 100644
--- a/crawl-ref/source/newgame.h
+++ b/crawl-ref/source/newgame.h
@@ -8,18 +8,46 @@
 #ifndef NEWGAME_H
 #define NEWGAME_H
 
+enum death_knight_type
+{
+    DK_NO_SELECTION,
+    DK_NECROMANCY,
+    DK_YREDELEMNUL,
+    DK_RANDOM
+};
+
+enum startup_book_type
+{
+    SBT_NO_SELECTION = 0,
+    SBT_FIRE,
+    SBT_COLD,
+    SBT_SUMM,
+    SBT_RANDOM
+};
+
+enum startup_wand_type
+{
+    SWT_NO_SELECTION = 0,
+    SWT_ENSLAVEMENT,
+    SWT_CONFUSION,
+    SWT_MAGIC_DARTS,
+    SWT_FROST,
+    SWT_FLAME,
+    SWT_STRIKING, // actually a rod
+    SWT_RANDOM
+};
 
 /* ***********************************************************************
  * called from: initfile
  * *********************************************************************** */
-int get_species_index_by_abbrev( const char *abbrev );
-int get_species_index_by_name( const char *name );
-const char *get_species_abbrev( int which_species );
-
-int get_class_index_by_abbrev( const char *abbrev );
-int get_class_index_by_name( const char *name );
-const char *get_class_abbrev( int which_job );
-const char *get_class_name( int which_job );
+int get_species_index_by_abbrev(const char *abbrev);
+int get_species_index_by_name(const char *name);
+const char *get_species_abbrev(int which_species);
+
+int get_class_index_by_abbrev(const char *abbrev);
+int get_class_index_by_name(const char *name);
+const char *get_class_abbrev(int which_job);
+const char *get_class_name(int which_job);
 
 /* ***********************************************************************
  * called from: debug and hiscores