Don't use enum numbers for mutations in crash dumps.

Also, include temporary ones.

Also, don't call all innates "demon".

1 files changed, 29 insertions, 7 deletions

diff --git a/crawl-ref/source/dbg-asrt.cc b/crawl-ref/source/dbg-asrt.cc
index 4608973171..cb2fb36c46 100644
--- a/crawl-ref/source/dbg-asrt.cc
+++ b/crawl-ref/source/dbg-asrt.cc
@@ -26,6 +26,7 @@
 #include "message.h"
 #include "monster.h"
 #include "mon-util.h"
+#include "mutation.h"
 #include "options.h"
 #include "religion.h"
 #include "skills2.h"
@@ -272,15 +273,36 @@ static void _dump_player(FILE *file)
 
     fprintf(file, "Mutations:\n");
     for (int i = 0; i < NUM_MUTATIONS; ++i)
-        if (you.mutation[i] > 0)
-            fprintf(file, "    #%d: %d\n", i, you.mutation[i]);
+    {
+        mutation_type mut = static_cast<mutation_type>(i);
+        int normal = you.mutation[i];
+        int innate = you.innate_mutations[i];
+        int temp   = you.temp_mutations[i];
+
+        // Normally innate and temp imply normal, but a crash handler should
+        // expect the spanish^Wunexpected.
+        if (!normal && !innate && !temp)
+            continue;
 
-    fprintf(file, "\n");
+        if (const char* name = mutation_name(mut))
+            fprintf(file, "    %s: %d", name, normal);
+        else
+            fprintf(file, "    unknown #%d: %d", i, normal);
 
-    fprintf(file, "Demon mutations:\n");
-    for (int i = 0; i < NUM_MUTATIONS; ++i)
-        if (you.innate_mutations[i] > 0)
-            fprintf(file, "    #%d: %d\n", i, you.innate_mutations[i]);
+        if (innate)
+            if (innate == normal)
+                fprintf(file, " (innate)");
+            else
+                fprintf(file, " (%d innate)", innate);
+
+        if (temp)
+            if (temp == normal)
+                fprintf(file, " (temporary)");
+            else
+                fprintf(file, " (%d temporary)", temp);
+
+        fprintf(file, "\n");
+    }
 
     fprintf(file, "\n");