Tweaked unique code to eliminate the confusing arithmetic on MONS enum values.

Breaks save compatibility again.

Added a unique curse skull. Indulge me.

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

1 files changed, 6 insertions, 4 deletions

diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index b5e419792f..10479c8031 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -108,6 +108,8 @@ public:
     virtual int       id() const = 0;
     virtual actor_type atype() const = 0;
 
+    virtual god_type  deity() const = 0;
+    
     virtual bool      alive() const = 0;
     
     virtual coord_def pos() const = 0;
@@ -558,8 +560,6 @@ public:
   int symbol;
   int colour;
 
-  FixedVector< char, NUM_STATUE_TYPES >  visible_statue;
-
   char redraw_hit_points;
   char redraw_magic_points;
   char redraw_strength;
@@ -634,7 +634,7 @@ public:
 
   FixedArray<unsigned char, 5, 50> item_description;
   FixedVector<unsigned char, 50> unique_items;
-  FixedVector<unsigned char, 50> unique_creatures;
+  FixedVector<bool, NUM_MONSTERS> unique_creatures;
 
   KillMaster kills;
 
@@ -644,7 +644,7 @@ public:
 
   FixedVector<unsigned char, 30> branch_stairs;
 
-  char religion;
+  god_type religion;
   unsigned char piety;
   unsigned char gift_timeout;
   FixedVector<unsigned char, MAX_NUM_GODS>  penance;
@@ -715,6 +715,7 @@ public:
     int id() const;
     actor_type atype() const { return ACT_PLAYER; }
 
+    god_type  deity() const;
     bool      alive() const;
     
     coord_def pos() const;
@@ -864,6 +865,7 @@ public:
     
     // actor interface
     int id() const;
+    god_type  deity() const;
     bool      alive() const;
     coord_def pos() const;
     bool      swimming() const;