* More steps on the path to reintroducing player doll customization.

Also apply my two previous commits to trunk.


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

1 files changed, 37 insertions, 36 deletions

diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h
index 7e84bbc775..885efbcc92 100644
--- a/crawl-ref/source/tiles.h
+++ b/crawl-ref/source/tiles.h
@@ -20,7 +20,7 @@
 enum tag_version
 {
     TILETAG_PRE_MCACHE = 71,
-    TILETAG_CURRENT = 72
+    TILETAG_CURRENT    = 72
 };
 
 struct dolls_data
@@ -126,6 +126,7 @@ void TileNewLevel(bool first_time);
 
 // edit player tile
 void TilePlayerEdit();
+void init_player_doll();
 
 int item_unid_type(const item_def &item);
 int tile_known_weapon_brand(const item_def item);
@@ -138,45 +139,45 @@ int get_clean_map_idx(int tile_idx);
 enum tile_flags
 {
     // Foreground flags
-    TILE_FLAG_S_UNDER   = 0x00000800,
-    TILE_FLAG_FLYING    = 0x00001000,
-    TILE_FLAG_PET       = 0x00002000,
-    TILE_FLAG_NEUTRAL   = 0x00004000,
-    TILE_FLAG_STAB      = 0x00008000,
-    TILE_FLAG_MAY_STAB  = 0x0000C000,
-    TILE_FLAG_NET       = 0x00010000,
-    TILE_FLAG_POISON    = 0x00020000,
-    TILE_FLAG_FLAME     = 0x00040000,
-    TILE_FLAG_ANIM_WEP  = 0x00080000,
+    TILE_FLAG_S_UNDER    = 0x00000800,
+    TILE_FLAG_FLYING     = 0x00001000,
+    TILE_FLAG_PET        = 0x00002000,
+    TILE_FLAG_NEUTRAL    = 0x00004000,
+    TILE_FLAG_STAB       = 0x00008000,
+    TILE_FLAG_MAY_STAB   = 0x0000C000,
+    TILE_FLAG_NET        = 0x00010000,
+    TILE_FLAG_POISON     = 0x00020000,
+    TILE_FLAG_FLAME      = 0x00040000,
+    TILE_FLAG_ANIM_WEP   = 0x00080000,
 
     // MDAM has 5 possibilities, so uses 3 bits.
-    TILE_FLAG_MDAM_MASK = 0x03800000,
-    TILE_FLAG_MDAM_LIGHT= 0x00800000,
-    TILE_FLAG_MDAM_MOD  = 0x01000000,
-    TILE_FLAG_MDAM_HEAVY= 0x01800000,
-    TILE_FLAG_MDAM_SEV  = 0x02000000,
-    TILE_FLAG_MDAM_ADEAD= 0x02800000,
+    TILE_FLAG_MDAM_MASK  = 0x03800000,
+    TILE_FLAG_MDAM_LIGHT = 0x00800000,
+    TILE_FLAG_MDAM_MOD   = 0x01000000,
+    TILE_FLAG_MDAM_HEAVY = 0x01800000,
+    TILE_FLAG_MDAM_SEV   = 0x02000000,
+    TILE_FLAG_MDAM_ADEAD = 0x02800000,
 
     // Background flags
-    TILE_FLAG_RAY       = 0x00000800,
-    TILE_FLAG_MM_UNSEEN = 0x00001000,
-    TILE_FLAG_UNSEEN    = 0x00002000,
-    TILE_FLAG_CURSOR1   = 0x00004000,
-    TILE_FLAG_CURSOR2   = 0x00008000,
-    TILE_FLAG_CURSOR3   = 0x0000C000,
-    TILE_FLAG_CURSOR    = 0x0000C000,
-    TILE_FLAG_BLOOD     = 0x00010000,
-    TILE_FLAG_HALO      = 0x00020000,
-    TILE_FLAG_NEW_STAIR = 0x00040000,
-    TILE_FLAG_TRAV_EXCL = 0x00080000,
-    TILE_FLAG_EXCL_CTR  = 0x00100000,
-    TILE_FLAG_SANCTUARY = 0x00200000,
-    TILE_FLAG_TUT_CURSOR= 0x00400000,
-    TILE_FLAG_RAY_OOR   = 0x00800000,
-    TILE_FLAG_OOR       = 0x01000000,
+    TILE_FLAG_RAY        = 0x00000800,
+    TILE_FLAG_MM_UNSEEN  = 0x00001000,
+    TILE_FLAG_UNSEEN     = 0x00002000,
+    TILE_FLAG_CURSOR1    = 0x00004000,
+    TILE_FLAG_CURSOR2    = 0x00008000,
+    TILE_FLAG_CURSOR3    = 0x0000C000,
+    TILE_FLAG_CURSOR     = 0x0000C000,
+    TILE_FLAG_BLOOD      = 0x00010000,
+    TILE_FLAG_HALO       = 0x00020000,
+    TILE_FLAG_NEW_STAIR  = 0x00040000,
+    TILE_FLAG_TRAV_EXCL  = 0x00080000,
+    TILE_FLAG_EXCL_CTR   = 0x00100000,
+    TILE_FLAG_SANCTUARY  = 0x00200000,
+    TILE_FLAG_TUT_CURSOR = 0x00400000,
+    TILE_FLAG_RAY_OOR    = 0x00800000,
+    TILE_FLAG_OOR        = 0x01000000,
 
     // General
-    TILE_FLAG_MASK      = 0x000007FF
+    TILE_FLAG_MASK       = 0x000007FF
 };
 
 enum
@@ -193,9 +194,9 @@ enum
 
 enum
 {
-    TILEP_GENDER_MALE = 0,
+    TILEP_GENDER_MALE   = 0,
     TILEP_GENDER_FEMALE = 1,
-    TILEP_SHOW_EQUIP = 0x1000
+    TILEP_SHOW_EQUIP    = 0x1000
 };
 
 enum tile_player_flag_cut