* Tweak Snorg's tile to increase the difference to the plain troll.

* Add a new tile each for the flaming corpse and trapdoor spider.
* Add a sticky flame overlay for the player tile.
* Move all unique monsters into dc-mon/unique (minus Adolf).
* Remove comments and commented out monsters from the tile definitions.
* Minor comment fixes and code cleanup.

I'm really starting to get the hang of the tile creation. :)


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

1 files changed, 17 insertions, 21 deletions

diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc
index 8edbbc7311..a4404f9e84 100644
--- a/crawl-ref/source/tile2.cc
+++ b/crawl-ref/source/tile2.cc
@@ -28,26 +28,26 @@
 #include "tiles.h"
 #include "transfor.h"
 
-static int wall_flavors     = 0;
-static int floor_flavors    = 0;
-static int special_flavors  = 0;
+static int wall_flavours    = 0;
+static int floor_flavours   = 0;
+static int special_flavours = 0;
 static int wall_tile_idx    = 0;
 static int floor_tile_idx   = 0;
 static int special_tile_idx = 0;
 
-int get_num_wall_flavors()
+int get_num_wall_flavours()
 {
-    return wall_flavors;
+    return wall_flavours;
 }
 
-int get_num_floor_flavors()
+int get_num_floor_flavours()
 {
-    return floor_flavors;
+    return floor_flavours;
 }
 
-int get_num_floor_special_flavors()
+int get_num_floor_special_flavours()
 {
-    return special_flavors;
+    return special_flavours;
 }
 
 int get_wall_tile_idx()
@@ -369,26 +369,22 @@ void TileLoadWall(bool wizard)
 {
     WallIdx(wall_tile_idx, floor_tile_idx, special_tile_idx);
 
-    // Number of flavors are generated automatically...
-    floor_flavors = tile_dngn_count(floor_tile_idx);
-    wall_flavors  = tile_dngn_count(wall_tile_idx);
+    // Number of flavours are generated automatically...
+    floor_flavours = tile_dngn_count(floor_tile_idx);
+    wall_flavours  = tile_dngn_count(wall_tile_idx);
 
     if (special_tile_idx != -1)
-    {
-        special_flavors = tile_dngn_count(special_tile_idx);
-    }
+        special_flavours = tile_dngn_count(special_tile_idx);
     else
-    {
-        special_flavors = 0;
-    }
+        special_flavours = 0;
 }
 
 int get_clean_map_idx(int tile_idx)
 {
     int idx = tile_idx & TILE_FLAG_MASK;
-    if (idx >= TILE_CLOUD_FIRE_0 && idx <= TILE_CLOUD_PURP_SMOKE ||
-        idx >= TILEP_MONS_SHADOW && idx <= TILEP_MONS_WATER_ELEMENTAL ||
-        idx >= TILEP_MCACHE_START)
+    if (idx >= TILE_CLOUD_FIRE_0 && idx <= TILE_CLOUD_PURP_SMOKE
+        || idx >= TILEP_MONS_SHADOW && idx <= TILEP_MONS_WATER_ELEMENTAL
+        || idx >= TILEP_MCACHE_START)
     {
         return 0;
     }