[crawl-ref-commits] master branch updated: 0.13-a0-2555-g23a7484

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

       via  23a74840f4654b120be714fef93c848aea82e63b (commit)
      from  1cebcb06b4d110ab7306ff819c1bc0bc433dcac8 (commit)

-----------------------------------------------------------------------
commit 23a74840f4654b120be714fef93c848aea82e63b
Author: Neil Moore <ne...@s-...>
Date:   Sun Jul 28 18:29:20 2013 -0400

    Fix webtiles compilation.
    
    The change of player_under_penance from returning a bool to an int
    broke a template instantiation that required two arguments to be
    the same type.

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

Summary of changes:
 crawl-ref/source/tileweb.cc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/crawl-ref/source/tileweb.cc b/crawl-ref/source/tileweb.cc
index 1a39dfb..204daeb 100644
--- a/crawl-ref/source/tileweb.cc
+++ b/crawl-ref/source/tileweb.cc
@@ -617,7 +617,7 @@ void TilesFramework::_send_player(bool force_full)
     else if (!you_worship(GOD_NO_GOD))
         god = god_name(you.religion);
     _update_string(force_full, c.god, god, "god");
-    _update_int(force_full, c.under_penance, player_under_penance(), "penance");
+    _update_int(force_full, c.under_penance, (bool) player_under_penance(), "penance");
     uint8_t prank = 0;
     if (you_worship(GOD_XOM))
     {


-- 
Dungeon Crawl Stone Soup