[crawl-ref-commits] master branch updated: 0.13-a0-2540-g772cbec

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

       via  772cbec2479d6b59ccb91cad149c7edf8968cf6f (commit)
       via  76fc0d8475ea3ad98689dcb971da2ff988837523 (commit)
      from  c2388105426bc7277bca52ef1fd236317f93eec8 (commit)

-----------------------------------------------------------------------
commit 772cbec2479d6b59ccb91cad149c7edf8968cf6f
Author: Adam Borowski <kil...@an...>
Date:   Sat Jul 27 13:02:02 2013 +0200

    Remove a 402 years old fart joke.
    
    (Purging now unused desc.)

commit 76fc0d8475ea3ad98689dcb971da2ff988837523
Author: Adam Borowski <kil...@an...>
Date:   Sat Jul 27 02:37:37 2013 +0200

    Whitespace/brace fixes.

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

Summary of changes:
 crawl-ref/source/dat/descript/features.txt |   16 ----------------
 crawl-ref/source/menu.cc                   |    4 ++--
 crawl-ref/source/tilecell.cc               |    2 --
 crawl-ref/source/tiles.h                   |    2 +-
 4 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/crawl-ref/source/dat/descript/features.txt b/crawl-ref/source/dat/descript/features.txt
index 5891d07..6534866 100644
--- a/crawl-ref/source/dat/descript/features.txt
+++ b/crawl-ref/source/dat/descript/features.txt
@@ -132,22 +132,6 @@ experienced characters can die there. On the other hand, these halls contain
 several runes and lots of valuable items. It is much easier to get in than to
 get out.
 %%%%
-A gas trap
-
-You're lucky to have noticed this trap, for it would have released a cloud of
-deadly gas at you. Exactly what gas it holds, you cannot tell — perhaps it is
-plain poison, perhaps mutagenic fumes, perhaps flammable vapour, or perhaps
-something yet nastier.
-%%%%
-A gas trap:quote
-
-“Good your grace, an’ I had room for such a thundergust within mine ancient
-bowels, ’tis not in reason I coulde discharge ye same and live to thank God for
-yt. He did choose handmaid so humble whereby to shew his power. Nay, ’tis not I
-yt have broughte forth this rich o’ermastering fog, this fragrant gloom, so
-pray you seeke ye further.”
-    -Mark Twain, “1601”, 1880.
-%%%%
 A gate to the Realm of Zot
 
 This gate leads to the Realm of Zot, the final stage of your quest as its
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc
index 9b801fe..02d4b62 100644
--- a/crawl-ref/source/menu.cc
+++ b/crawl-ref/source/menu.cc
@@ -2393,7 +2393,7 @@ MenuObject* PrecisionMenu::_find_object_by_direction(const MenuObject* start,
         // tiles saves entry coordinates in pixels, yet console saves them
         // in characters
         // basically, we want the AABB to be large enough to extend to the
-	// bottom of the screen in every possible resolution
+        // bottom of the screen in every possible resolution
         aabb_end.y = 32767;
         break;
     case LEFT:
@@ -3651,7 +3651,7 @@ MenuItem* MenuFreeform::_find_item_by_direction(const MenuItem* start,
         // tiles saves entry coordinates in pixels, yet console saves them
         // in characters
         // basically, we want the AABB to be large enough to extend to the
-	// bottom of the screen in every possible resolution
+        // bottom of the screen in every possible resolution
         aabb_end.y = 32767;
         break;
     case LEFT:
diff --git a/crawl-ref/source/tilecell.cc b/crawl-ref/source/tilecell.cc
index b669669..ff40a00 100644
--- a/crawl-ref/source/tilecell.cc
+++ b/crawl-ref/source/tilecell.cc
@@ -473,9 +473,7 @@ void pack_cell_overlays(const coord_def &gc, packed_cell *cell)
     {
         tileidx_t shadow_tile = TILE_DNGN_WALL_SHADOW;
         if (player_in_branch(BRANCH_CRYPT))
-        {
             shadow_tile = TILE_DNGN_WALL_SHADOW_DARK;
-        }
         _pack_wall_shadows(gc, cell, shadow_tile);
     }
 }
diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h
index 90f15c0..f0b4a3c 100644
--- a/crawl-ref/source/tiles.h
+++ b/crawl-ref/source/tiles.h
@@ -22,7 +22,7 @@ enum TextureID
 struct tile_def
 {
     tile_def(tileidx_t _tile, TextureID _tex, int _ymax = TILE_Y)
-            : tile(_tile), tex(_tex), ymax(_ymax){}
+            : tile(_tile), tex(_tex), ymax(_ymax) {}
 
     tileidx_t tile;
     TextureID tex;


-- 
Dungeon Crawl Stone Soup