Cleaned up ghost and Pandemonium demon handling.

Can now have multiple ghosts or Pandemonium demons on a level. Ghosts and Pan
demons can coexist. (D:9 and later are eligible for >1 ghost.) Enabled loading
ghosts in Pandemonium.

Pandemonium demons can now be created outside Pan. Not that you'd want to do
it, but you can.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/Kills.cc b/crawl-ref/source/Kills.cc
index 5dcb4ba495..7bf7e86388 100644
--- a/crawl-ref/source/Kills.cc
+++ b/crawl-ref/source/Kills.cc
@@ -612,16 +612,16 @@ void kill_def::load(FILE *file)
     }
 }
 
-kill_ghost::kill_ghost(const struct monsters *mon)
+kill_ghost::kill_ghost(const monsters *mon)
 {
     exp = exper_value(mon);
     place = get_packed_place();
-    ghost_name = ghost.name;
+    ghost_name = mon->ghost->name;
 
     // Check whether this is really a ghost, since we also have to handle
     // the Pandemonic demons.
     if (mon->type == MONS_PLAYER_GHOST)
-        ghost_name = "The ghost of " + ghost_description(true);
+        ghost_name = "The ghost of " + ghost_description(*mon, true);
 }
 
 std::string kill_ghost::info() const