[crawl-ref-commits] master branch updated: 0.11-a0-2539-gc009cb1

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

       via  c009cb19910bad496f15d39e07355090c9414e10 (commit)
       via  6f2e67e1cc4e735046fa17a1669fd88230bc91f1 (commit)
      from  ab6943af27172ffca75dc23c624f3689e2c767f6 (commit)

-----------------------------------------------------------------------
commit c009cb19910bad496f15d39e07355090c9414e10
Author: Florian Diebold <flo...@gm...>
Date:   Sat Jun 30 13:25:23 2012 +0200

    Fix lobby idle time updating in webtiles.

commit 6f2e67e1cc4e735046fa17a1669fd88230bc91f1
Author: Florian Diebold <flo...@gm...>
Date:   Fri Jun 29 23:21:58 2012 +0200

    Implement old_blood rendering in webtiles.

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

Summary of changes:
 crawl-ref/source/tilecell.cc                       |    4 ++++
 crawl-ref/source/tileweb.cc                        |    4 ++++
 .../webserver/game_data/static/cell_renderer.js    |    2 ++
 .../source/webserver/static/scripts/client.js      |    2 +-
 4 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/crawl-ref/source/tilecell.cc b/crawl-ref/source/tilecell.cc
index bd9cd78..adc5755 100644
--- a/crawl-ref/source/tilecell.cc
+++ b/crawl-ref/source/tilecell.cc
@@ -33,6 +33,8 @@ void packed_cell::clear()
     is_liquefied     = false;
     swamp_tree_water = false;
     orb_glow         = 0;
+    blood_rotation   = 0;
+    old_blood        = false;
 }
 
 bool packed_cell::operator ==(const packed_cell &other) const
@@ -50,6 +52,8 @@ bool packed_cell::operator ==(const packed_cell &other) const
     if (is_liquefied != other.is_liquefied) return false;
     if (swamp_tree_water != other.swamp_tree_water) return false;
     if (orb_glow != other.orb_glow) return false;
+    if (blood_rotation != other.blood_rotation) return false;
+    if (old_blood != other.old_blood) return false;
 
     if (num_dngn_overlay != other.num_dngn_overlay) return false;
     for (int i = 0; i < num_dngn_overlay; ++i)
diff --git a/crawl-ref/source/tileweb.cc b/crawl-ref/source/tileweb.cc
index 39e5875..78ca827 100644
--- a/crawl-ref/source/tileweb.cc
+++ b/crawl-ref/source/tileweb.cc
@@ -713,6 +713,10 @@ void TilesFramework::_send_cell(const coord_def &gc,
             || next_pc.is_bloody != current_pc.is_bloody)
             write_message("bloody:%u,", next_pc.is_bloody);
 
+        if ((force_full && next_pc.old_blood)
+            || next_pc.old_blood != current_pc.old_blood)
+            write_message("old_blood:%u,", next_pc.old_blood);
+
         if ((force_full && next_pc.is_silenced)
             || next_pc.is_silenced != current_pc.is_silenced)
             write_message("silenced:%u,", next_pc.is_silenced);
diff --git a/crawl-ref/source/webserver/game_data/static/cell_renderer.js b/crawl-ref/source/webserver/game_data/static/cell_renderer.js
index 94baf8f..c2dbc99 100644
--- a/crawl-ref/source/webserver/game_data/static/cell_renderer.js
+++ b/crawl-ref/source/webserver/game_data/static/cell_renderer.js
@@ -374,6 +374,8 @@ function ($, view_data, main, player, icons, dngn, enums, map_knowledge, tileinf
                 var basetile;
                 if (is_wall)
                 {
+                    basetile = cell.old_blood ? dngn.WALL_OLD_BLOOD : dngn.WALL_BLOOD_S;
+                    basetile += tile_dngn_count(basetile) * cell.bloodrot;
                     basetile = dngn.WALL_BLOOD_S + dngn.tile_count(dngn.WALL_BLOOD_S)
                         * cell.bloodrot;
                 }
diff --git a/crawl-ref/source/webserver/static/scripts/client.js b/crawl-ref/source/webserver/static/scripts/client.js
index a5c540b..2644075 100644
--- a/crawl-ref/source/webserver/static/scripts/client.js
+++ b/crawl-ref/source/webserver/static/scripts/client.js
@@ -606,7 +606,7 @@ function (exports, $, key_conversion, chat, comm) {
                 $this.data("time", time)
                     .attr("data-time", "" + time);
                 $this.data("sort", "" + time)
-                    .attr("data-sort", "" + sort);
+                    .attr("data-sort", "" + time);
             }
         });
     }


-- 
Dungeon Crawl Stone Soup