diff options
| -rw-r--r-- | crawl-ref/source/hiscores.cc | 28 | ||||
| -rw-r--r-- | crawl-ref/source/ouch.h | 23 |
2 files changed, 13 insertions, 38 deletions
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc index d505097907..2eca91acc0 100644 --- a/crawl-ref/source/hiscores.cc +++ b/crawl-ref/source/hiscores.cc @@ -419,12 +419,12 @@ static void _hs_write( FILE *scores, scorefile_entry &se ) static const char *kill_method_names[] = { - "mon", "pois", "cloud", "beam", "deaths_door", "lava", "water", + "mon", "pois", "cloud", "beam", "lava", "water", "stupidity", "weakness", "clumsiness", "trap", "leaving", "winning", "quitting", "draining", "starvation", "freezing", "burning", - "wild_magic", "xom", "statue", "rotting", "targetting", "spore", - "tso_smiting", "petrification", "unknown", "something", - "falling_down_stairs", "acid", "curare", "melting", "bleeding", + "wild_magic", "xom", "rotting", "targetting", "spore", + "tso_smiting", "petrification", "something", + "falling_down_stairs", "acid", "curare", "beogh_smiting", "divine_wrath", "bounce", "reflect", "self_aimed", "falling_through_gate" }; @@ -1565,13 +1565,6 @@ std::string scorefile_entry::death_description(death_desc_verbosity verbosity) } break; -/* deprecated */ -/* - case KILLED_BY_DEATHS_DOOR: - desc += terse? "Death's door" : "Knocked on Death's door"; - break; -*/ - case KILLED_BY_LAVA: if (terse) desc += "lava"; @@ -1693,11 +1686,6 @@ std::string scorefile_entry::death_description(death_desc_verbosity verbosity) needs_damage = true; break; - case KILLED_BY_STATUE: - desc += terse? "statue" : "Killed by a statue"; - needs_damage = true; - break; - case KILLED_BY_ROTTING: desc += terse? "rotting" : "Rotted away"; break; @@ -1818,14 +1806,6 @@ std::string scorefile_entry::death_description(death_desc_verbosity verbosity) 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; - case KILLED_BY_DIVINE_WRATH: if (terse) desc += "divine wrath"; diff --git a/crawl-ref/source/ouch.h b/crawl-ref/source/ouch.h index 5d36852168..721acefc3f 100644 --- a/crawl-ref/source/ouch.h +++ b/crawl-ref/source/ouch.h @@ -16,42 +16,37 @@ // Keep in sync with names in hiscores.cc. enum kill_method_type { - KILLED_BY_MONSTER, // 0 + KILLED_BY_MONSTER, KILLED_BY_POISON, KILLED_BY_CLOUD, - KILLED_BY_BEAM, // 3 - KILLED_BY_DEATHS_DOOR, // should be deprecated, but you never know {dlb} - KILLED_BY_LAVA, // 5 + KILLED_BY_BEAM, + KILLED_BY_LAVA, KILLED_BY_WATER, KILLED_BY_STUPIDITY, KILLED_BY_WEAKNESS, KILLED_BY_CLUMSINESS, - KILLED_BY_TRAP, // 10 + KILLED_BY_TRAP, KILLED_BY_LEAVING, KILLED_BY_WINNING, KILLED_BY_QUITTING, KILLED_BY_DRAINING, - KILLED_BY_STARVATION, // 15 + KILLED_BY_STARVATION, KILLED_BY_FREEZING, KILLED_BY_BURNING, KILLED_BY_WILD_MAGIC, KILLED_BY_XOM, - KILLED_BY_STATUE, // 20 KILLED_BY_ROTTING, KILLED_BY_TARGETTING, KILLED_BY_SPORE, KILLED_BY_TSO_SMITING, - KILLED_BY_PETRIFICATION, // 25 - // 26 - KILLED_BY_SOMETHING = 27, + KILLED_BY_PETRIFICATION, + KILLED_BY_SOMETHING, KILLED_BY_FALLING_DOWN_STAIRS, KILLED_BY_ACID, - KILLED_BY_CURARE, // 30 - KILLED_BY_MELTING, - KILLED_BY_BLEEDING, + KILLED_BY_CURARE, KILLED_BY_BEOGH_SMITING, KILLED_BY_DIVINE_WRATH, - KILLED_BY_BOUNCE, // 35 + KILLED_BY_BOUNCE, KILLED_BY_REFLECTION, KILLED_BY_SELF_AIMED, KILLED_BY_FALLING_THROUGH_GATE, |