summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorFlorian Diebold <flodiebold@gmail.com>2011-04-15 15:24:20 +0200
committerFlorian Diebold <flodiebold@gmail.com>2011-06-26 17:41:21 +0200
commit8440f08efeaf4f0b370d8e4244a221a83aebf0cc (patch)
treeaf7662dfdf3974564070a2e4688e9cecd3aa939f /crawl-ref
parent547d3685d299015793e68392f6accd3b8ece211a (diff)
downloadcrawl-ref-8440f08efeaf4f0b370d8e4244a221a83aebf0cc.tar.gz
crawl-ref-8440f08efeaf4f0b370d8e4244a221a83aebf0cc.zip
Fix compilation after rebase.
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/tilecell.cc2
-rw-r--r--crawl-ref/source/tilecell.h8
-rw-r--r--crawl-ref/source/tileweb.cc3
-rw-r--r--crawl-ref/source/webserver/static/render.js6
4 files changed, 14 insertions, 5 deletions
diff --git a/crawl-ref/source/tilecell.cc b/crawl-ref/source/tilecell.cc
index 54d39ccad8..44fed0318d 100644
--- a/crawl-ref/source/tilecell.cc
+++ b/crawl-ref/source/tilecell.cc
@@ -19,6 +19,7 @@ void packed_cell::clear()
is_silenced = false;
is_haloed = false;
is_moldy = false;
+ glowing_mold = false;
is_sanctuary = false;
is_liquefied = false;
swamp_tree_water = false;
@@ -33,6 +34,7 @@ bool packed_cell::operator ==(const packed_cell &other) const
if (is_silenced != other.is_silenced) return false;
if (is_haloed != other.is_haloed) return false;
if (is_moldy != other.is_moldy) return false;
+ if (glowing_mold != other.glowing_mold) return false;
if (is_sanctuary != other.is_sanctuary) return false;
if (is_liquefied != other.is_liquefied) return false;
if (swamp_tree_water != other.swamp_tree_water) return false;
diff --git a/crawl-ref/source/tilecell.h b/crawl-ref/source/tilecell.h
index 2bb14b4d09..3a8b68302f 100644
--- a/crawl-ref/source/tilecell.h
+++ b/crawl-ref/source/tilecell.h
@@ -18,6 +18,7 @@ struct packed_cell
bool is_silenced;
bool is_haloed;
bool is_moldy;
+ bool glowing_mold;
bool is_sanctuary;
bool is_liquefied;
bool swamp_tree_water;
@@ -27,9 +28,9 @@ struct packed_cell
bool operator !=(const packed_cell &other) const { return !(*this == other); }
packed_cell() : num_dngn_overlay(0), is_bloody(false), is_silenced(false),
- is_haloed(false), is_moldy(false), is_sanctuary(false),
- is_liquefied(false), swamp_tree_water (false),
- blood_rotation(0) {}
+ is_haloed(false), is_moldy(false), glowing_mold(false),
+ is_sanctuary(false), is_liquefied(false),
+ swamp_tree_water (false), blood_rotation(0) {}
packed_cell(const packed_cell* c) : num_dngn_overlay(c->num_dngn_overlay),
fg(c->fg), bg(c->bg), flv(c->flv),
@@ -37,6 +38,7 @@ struct packed_cell
is_silenced(c->is_silenced),
is_haloed(c->is_haloed),
is_moldy(c->is_moldy),
+ glowing_mold(c->glowing_mold),
is_sanctuary(c->is_sanctuary),
is_liquefied(c->is_liquefied),
swamp_tree_water(c->swamp_tree_water),
diff --git a/crawl-ref/source/tileweb.cc b/crawl-ref/source/tileweb.cc
index f82bc8a88a..01c14adf15 100644
--- a/crawl-ref/source/tileweb.cc
+++ b/crawl-ref/source/tileweb.cc
@@ -200,13 +200,14 @@ void _send_cell(int x, int y, const screen_cell_t *vbuf_cell, const coord_def &g
cell.flv.feat = 0;
}
- fprintf(stdout, "c(%d,%d,{fg:%d,bg:%d,%s%s%s%s%s%s%s",
+ fprintf(stdout, "c(%d,%d,{fg:%d,bg:%d,%s%s%s%s%s%s%s%s",
x, y, cell.fg, cell.bg,
// These could obviously be shorter, but I don't think they need to be
cell.is_bloody ? "bloody:true," : "",
cell.is_silenced ? "silenced:true," : "",
cell.is_haloed ? "haloed:true," : "",
cell.is_moldy ? "moldy:true," : "",
+ cell.glowing_mold ? "glowing_mold:true" : "",
cell.is_sanctuary ? "sanctuary:true," : "",
cell.is_liquefied ? "liquefied:true," : "",
cell.swamp_tree_water ? "swtree:true," : "");
diff --git a/crawl-ref/source/webserver/static/render.js b/crawl-ref/source/webserver/static/render.js
index 460da0cf4a..481c68b6c5 100644
--- a/crawl-ref/source/webserver/static/render.js
+++ b/crawl-ref/source/webserver/static/render.js
@@ -253,11 +253,15 @@ function draw_blood_overlay(x, y, cell, is_wall)
draw_dngn(basetile + offset, x, y);
}
else if (cell.moldy)
-
{
offset = cell.flv.s % tile_dngn_count(TILE_MOLD);
draw_dngn(TILE_MOLD + offset, x, y);
}
+ else if (cell.glowing_mold)
+ {
+ offset = cell.flv.special % tile_dngn_count(TILE_GLOWING_MOLD);
+ draw_dngn(TILE_GLOWING_MOLD + offset, x, y);
+ }
}
function draw_background(x, y, cell)