[crawl-ref-commits] master branch updated: 0.13-a0-2560-g2b2dd30

[<gi...@cr...>]

       via  2b2dd308415ef86a10c92876da334e6b2269b748 (commit)
      from  10fbfae4d8495bb69a1128c790672cefef45b613 (commit)

-----------------------------------------------------------------------
commit 2b2dd308415ef86a10c92876da334e6b2269b748
Author: ontoclasm <yok...@gm...>
Date:   Mon Jul 29 19:01:29 2013 +0100

    Differentiate noxious fumes in tiles

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/rltiles/dc-misc.txt            |    3 +++
 crawl-ref/source/rltiles/effect/cloud_meph0.png |  Bin 0 -> 506 bytes
 crawl-ref/source/rltiles/effect/cloud_meph1.png |  Bin 0 -> 634 bytes
 crawl-ref/source/rltiles/effect/cloud_meph2.png |  Bin 0 -> 691 bytes
 crawl-ref/source/tilepick.cc                    |    5 ++++-
 5 files changed, 7 insertions(+), 1 deletions(-)
 create mode 100644 crawl-ref/source/rltiles/effect/cloud_meph0.png
 create mode 100644 crawl-ref/source/rltiles/effect/cloud_meph1.png
 create mode 100644 crawl-ref/source/rltiles/effect/cloud_meph2.png

diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt
index a9da9a3..deebe59 100644
--- a/crawl-ref/source/rltiles/dc-misc.txt
+++ b/crawl-ref/source/rltiles/dc-misc.txt
@@ -106,6 +106,9 @@ cloud_cold2 CLOUD_COLD_2
 cloud_poison0 CLOUD_POISON_0
 cloud_poison1 CLOUD_POISON_1
 cloud_poison2 CLOUD_POISON_2
+cloud_meph0 CLOUD_MEPHITIC_0
+cloud_meph1 CLOUD_MEPHITIC_1
+cloud_meph2 CLOUD_MEPHITIC_2
 cloud_black_smoke CLOUD_BLACK_SMOKE
 cloud_black_smoke_disturbance CLOUD_BLACK_SMOKE_DISTURBANCE
 cloud_blue_smoke CLOUD_BLUE_SMOKE
diff --git a/crawl-ref/source/rltiles/effect/cloud_meph0.png b/crawl-ref/source/rltiles/effect/cloud_meph0.png
new file mode 100644
index 0000000..54cf8dc
Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_meph0.png differ
diff --git a/crawl-ref/source/rltiles/effect/cloud_meph1.png b/crawl-ref/source/rltiles/effect/cloud_meph1.png
new file mode 100644
index 0000000..737cee0
Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_meph1.png differ
diff --git a/crawl-ref/source/rltiles/effect/cloud_meph2.png b/crawl-ref/source/rltiles/effect/cloud_meph2.png
new file mode 100644
index 0000000..92080e9
Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_meph2.png differ
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index c9aada6..2805ae4 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -4580,11 +4580,14 @@ tileidx_t tileidx_cloud(const cloud_info &cl, bool disturbance)
                 ch = TILE_CLOUD_COLD_0 + dur;
                 break;
 
-            case CLOUD_MEPHITIC:
             case CLOUD_POISON:
                 ch = TILE_CLOUD_POISON_0 + dur;
                 break;
 
+            case CLOUD_MEPHITIC:
+                ch = TILE_CLOUD_MEPHITIC_0 + dur;
+                break;
+
             case CLOUD_BLUE_SMOKE:
                 ch = TILE_CLOUD_BLUE_SMOKE;
                 break;


-- 
Dungeon Crawl Stone Soup