summaryrefslogtreecommitdiff
path: root/Block.cpp
diff options
context:
space:
mode:
authorJapa2010-08-19 22:30:16 +0000
committerJapa2010-08-19 22:30:16 +0000
commitb9bdf197ee873dbba05915eb965d9524eae25f2f (patch)
treeefa4dbb2c1989a52a60f5502262504b1840ad79e /Block.cpp
parent1ac23f7c6a2e9e9db98cb0439904bbd684644572 (diff)
downloadstonesense-b9bdf197ee873dbba05915eb965d9524eae25f2f.tar.gz
stonesense-b9bdf197ee873dbba05915eb965d9524eae25f2f.tar.bz2
stonesense-b9bdf197ee873dbba05915eb965d9524eae25f2f.tar.xz
Fixed a boatload of bugs
Diffstat (limited to 'Block.cpp')
-rw-r--r--Block.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/Block.cpp b/Block.cpp
index 32c00fe..a29192f 100644
--- a/Block.cpp
+++ b/Block.cpp
@@ -159,8 +159,11 @@ void Block::Draw(){
{
spriteobject->set_sheetindex(SPRITEOBJECT_FLOOR_NA);
spriteobject->set_fileindex(INVALID_INDEX);
+ spriteobject->set_offset(0, WALLHEIGHT);
+ spriteobject->draw_world(x, y, z);
}
- spriteobject->draw_world(x, y, z);
+ else
+ spriteobject->draw_world(x, y, z);
}
}
@@ -184,14 +187,15 @@ void Block::Draw(){
{
spriteobject->set_sheetindex(0);
spriteobject->set_fileindex(INVALID_INDEX);
+ spriteobject->set_defaultsheet(IMGRampSheet);
}
if (spriteobject->get_sheetindex() != INVALID_INDEX)
{
spriteobject->set_size(SPRITEWIDTH, SPRITEHEIGHT);
- spriteobject->set_offset(0, 0);
spriteobject->set_tile_layout(RAMPBOTTOMTILE);
spriteobject->draw_world(x, y, z, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
}
+ spriteobject->set_tile_layout(BLOCKTILE);
}
drawFloorBlood ( this, drawx, drawy );
@@ -287,6 +291,8 @@ void Block::Draw(){
{
spriteobject->set_sheetindex(SPRITEOBJECT_WALL_NA);
spriteobject->set_fileindex(INVALID_INDEX);
+ spriteobject->set_tile_layout(BLOCKTILE);
+ spriteobject->set_defaultsheet(IMGObjectSheet);
}
if (spriteobject->get_sheetindex() == INVALID_INDEX)
{
@@ -447,8 +453,11 @@ void Block::DrawRamptops(){
spriteobject->set_size(SPRITEWIDTH, TILEHEIGHT);
spriteobject->set_offset(0, -(FLOORHEIGHT));
spriteobject->set_tile_layout(RAMPTOPTILE);
+ spriteobject->set_defaultsheet(IMGRampSheet);
spriteobject->draw_world(x, y, z, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
+ spriteobject->set_offset(0, 0);
}
+ spriteobject->set_tile_layout(BLOCKTILE);
}
}