diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-22 08:41:20 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-22 08:41:20 +0000 |
| commit | 1d0f57cbceb778139ca215cc4fcfd1584951f6dd (patch) | |
| tree | cafd60c944c51fcce778aa5d6912bc548c518339 /crawl-ref/source/Kills.h | |
| parent | 6f5e187a9e5cd348296dba2fd89d2e206e775a01 (diff) | |
| download | crawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.tar.gz crawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.zip | |
Merged stone_soup r15:451 into trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@452 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/Kills.h')
| -rw-r--r-- | crawl-ref/source/Kills.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/crawl-ref/source/Kills.h b/crawl-ref/source/Kills.h index 28c30a88c8..f3ada4fe40 100644 --- a/crawl-ref/source/Kills.h +++ b/crawl-ref/source/Kills.h @@ -160,7 +160,7 @@ public: std::string kill_info() const; private: - const char *category_name(KillCategory kc) const; + const char *category_name(kill_category kc) const; Kills categorized_kills[KC_NCATEGORIES]; private: @@ -169,13 +169,6 @@ private: const; }; -unsigned short get_packed_place(); - -unsigned short get_packed_place( unsigned char branch, int subdepth, - char level_type ); - -std::string short_place_name(unsigned short place); - enum KILL_DUMP_OPTIONS { KDO_NO_PLACES, // Don't dump places at all |