Separate feature data into feature-data.h.

1 files changed, 13 insertions, 23 deletions

diff --git a/crawl-ref/source/feature.h b/crawl-ref/source/feature.h
index 7690f6b2b4..aacadd7db1 100644
--- a/crawl-ref/source/feature.h
+++ b/crawl-ref/source/feature.h
@@ -5,33 +5,23 @@
 
 struct feature_def
 {
-    dungeon_char_type   dchar;
-    ucs_t               symbol;          // symbol used for seen terrain
-    ucs_t               magic_symbol;    // symbol used for magic-mapped terrain
-    unsigned short      colour;          // normal in LoS colour
-    unsigned short      map_colour;      // colour when out of LoS on display
-    unsigned short      seen_colour;     // map_colour when env.map_knowledge().seen()
-    unsigned short      em_colour;       // Emphasised colour when in LoS.
-    unsigned short      seen_em_colour;  // Emphasised colour when out of LoS
-    unsigned            flags;
-    map_feature         minimap;         // mini-map categorization
-
-    feature_def() :
-        dchar(NUM_DCHAR_TYPES),
-        symbol(0),
-        magic_symbol(0),
-        colour(BLACK),
-        map_colour(DARKGREY),
-        seen_colour(BLACK),
-        em_colour(BLACK),
-        seen_em_colour(BLACK),
-        flags(FFT_NONE),
-        minimap(MF_UNSEEN)
-    {}
+    dungeon_feature_type feat;
+    dungeon_char_type    dchar;           // used for creating symbol
+    ucs_t                symbol;          // symbol used for seen terrain
+    ucs_t                magic_symbol;    // symbol used for magic-mapped terrain
+    unsigned short       colour;          // normal in LoS colour
+    unsigned short       map_colour;      // colour when out of LoS on display
+    unsigned short       seen_colour;     // map_colour when env.map_knowledge().seen()
+    unsigned short       em_colour;       // Emphasised colour when in LoS.
+    unsigned short       seen_em_colour;  // Emphasised colour when out of LoS
+    unsigned             flags;
+    map_feature          minimap;         // mini-map categorization
 
     bool is_notable() const { return flags & FFT_NOTABLE; }
 };
 
+void init_fd(feature_def& fd);
+
 const feature_def &get_feature_def(show_type object);
 const feature_def &get_feature_def(dungeon_feature_type feat);