summaryrefslogtreecommitdiff
path: root/Block.cpp
diff options
context:
space:
mode:
authorJapa2010-09-08 17:47:38 +0000
committerJapa2010-09-08 17:47:38 +0000
commit23600640529542241bea58737ee8a0fb6eb430d1 (patch)
tree4785f442e6299d5d770257dbe7a161a64959fcca /Block.cpp
parent6079281a49efb84bbae98f4b9fb8649e7a4ee754 (diff)
downloadstonesense-23600640529542241bea58737ee8a0fb6eb430d1.tar.gz
stonesense-23600640529542241bea58737ee8a0fb6eb430d1.tar.bz2
stonesense-23600640529542241bea58737ee8a0fb6eb430d1.tar.xz
moved fluid drawing into XML files
Diffstat (limited to 'Block.cpp')
-rw-r--r--Block.cpp17
1 files changed, 2 insertions, 15 deletions
diff --git a/Block.cpp b/Block.cpp
index fc25244..76033f9 100644
--- a/Block.cpp
+++ b/Block.cpp
@@ -311,28 +311,15 @@ void Block::Draw(){
if(water.index > 0)
{
- int spriteNum = 0;
- int waterlevel = water.index;
-
//if(waterlevel == 7) waterlevel--;
-
- ALLEGRO_COLOR spatter;
if(water.type == 0)
{
- if(bloodlevel == 0)
- spatter = al_map_rgb(168,248,248);
- else if(bloodlevel <= config.bloodcutoff)
- spatter = partialBlend(al_map_rgb(168,248,248), bloodcolor, (bloodlevel*100/config.bloodcutoff));
- else
- spatter = bloodcolor;
- spriteNum = SPRITEOBJECT_WATERLEVEL1 + waterlevel - 1;
+ contentLoader.water[water.index-1].sprite.draw_world(x, y, z, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
}
else
{
- spriteNum = SPRITEOBJECT_WATERLEVEL1_LAVA + waterlevel - 1;
- spatter = al_map_rgb(255,255,255);
+ contentLoader.lava[water.index-1].sprite.draw_world(x, y, z, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
}
- DrawSpriteFromSheet( spriteNum, IMGObjectSheet, spatter, drawx, drawy );
}
// creature