Applied Shawn Moore's patch to reorder death cause switch to match enum in hiscores.cc.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@715 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 18 insertions, 9 deletions

diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index 61020d5e11..b09c544e3d 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -1779,9 +1779,12 @@ scorefile_entry::death_description(death_desc_verbosity verbosity) const
         }
         break;
 
-    case KILLED_BY_CURARE:
-        desc += terse? "asphyx" : "Asphyxiated";
+/* deprecated */
+/*
+    case KILLED_BY_DEATHS_DOOR:
+        desc += terse? "Death's door" : "Knocked on Death's door";
         break;
+*/
 
     case KILLED_BY_LAVA:
         if (terse)
@@ -1919,13 +1922,7 @@ scorefile_entry::death_description(death_desc_verbosity verbosity) const
         desc += terse? "petrified" : "Turned to stone";
         break;
 
-    case KILLED_BY_MELTING:
-        desc += terse? "melted" : " melted into a puddle";
-        break;
-
-    case KILLED_BY_BLEEDING:
-        desc += terse? "bleeding" : " bled to death";
-        break;
+    /* case 26 */
 
     case KILLED_BY_SOMETHING:
         if (auxkilldata)
@@ -1944,6 +1941,18 @@ scorefile_entry::death_description(death_desc_verbosity verbosity) const
         desc += terse? "acid" : "Splashed by acid";
         needs_damage = true;
         break;
+    
+    case KILLED_BY_CURARE:
+        desc += terse? "asphyx" : "Asphyxiated";
+        break;
+
+    case KILLED_BY_MELTING:
+        desc += terse? "melted" : " melted into a puddle";
+        break;
+
+    case KILLED_BY_BLEEDING:
+        desc += terse? "bleeding" : " bled to death";
+        break;
 
     default:
         desc += terse? "program bug" : "Nibbled to death by software bugs";