Move the sacrifice_def definition to sacrifice-data.h (PleasingFungus).
authorShmuale Mark <shm.mark@gmail.com>
Mon, 3 Nov 2014 21:37:09 +0000 (16:37 -0500)
committerShmuale Mark <shm.mark@gmail.com>
Mon, 3 Nov 2014 21:37:50 +0000 (16:37 -0500)
crawl-ref/source/godabil.cc
crawl-ref/source/sacrifice-data.h

index 3fe88cc..ebcf6f6 100644 (file)
 #include "viewchar.h"
 #include "view.h"
 
-struct sacrifice_def
-{
-    ability_type  sacrifice;        // The ability that executes the sacrifice.
-    mutation_type mutation;         // The mutation that will be inflicted.
-    const char*   sacrifice_text;   // Format: "sacrifice your hand"
-                                    // in case of variable sacrifices or sac
-                                    // hand, this will be extended later
-    const char*   milestone_text;   // Format: "sacrificed <foo>"
-                                    // in case of variable sacrifices this will
-                                    // be extended later
-    int           base_piety;       // The piety that will be gained, modified
-                                    // by the skill points in the skill below.
-    skill_type    sacrifice_skill;  // This skill will be eliminated.
-    const char*   sacrifice_vector; // This is used for sacrifices which give
-                                    // multiple mutations. It is a key into
-                                    // you.props, yielding a list of mutations
-                                    // granted by the sacrifice.
-};
-
-// Load the sac_data array.
+// Load the sacrifice_def definition and the sac_data array.
 #include "sacrifice-data.h"
 
 static void _zin_saltify(monster* mon);
index 6d266fd..4317467 100644 (file)
@@ -1,4 +1,22 @@
-// See struct sacrifice_def in godabil.cc
+struct sacrifice_def
+{
+    ability_type  sacrifice;        // The ability that executes the sacrifice.
+    mutation_type mutation;         // The mutation that will be inflicted.
+    const char*   sacrifice_text;   // Format: "sacrifice your hand"
+                                    // in case of variable sacrifices or sac
+                                    // hand, this will be extended later
+    const char*   milestone_text;   // Format: "sacrificed <foo>"
+                                    // in case of variable sacrifices this will
+                                    // be extended later
+    int           base_piety;       // The piety that will be gained, modified
+                                    // by the skill points in the skill below.
+    skill_type    sacrifice_skill;  // This skill will be eliminated.
+    const char*   sacrifice_vector; // This is used for sacrifices which give
+                                    // multiple mutations. It is a key into
+                                    // you.props, yielding a list of mutations
+                                    // granted by the sacrifice.
+};
+
 static const sacrifice_def sac_data[] =
 {