diff options
| author | Japa | 2011-02-19 19:11:19 +0000 |
|---|---|---|
| committer | Japa | 2011-02-19 19:11:19 +0000 |
| commit | f1cd36716229dd3f0795824197b14dcd0d979540 (patch) | |
| tree | a9391276cc5f0c569fe531996964a6cb57d2263e /Block.cpp | |
| parent | d8523cd32f9aea85ce0ef0c6fb12c8562922dad2 (diff) | |
| parent | c2f73a1f356890e8ed6ada37a4613ce4836d4712 (diff) | |
| download | stonesense-f1cd36716229dd3f0795824197b14dcd0d979540.tar.gz stonesense-f1cd36716229dd3f0795824197b14dcd0d979540.tar.bz2 stonesense-f1cd36716229dd3f0795824197b14dcd0d979540.tar.xz | |
merged in the multithreaded branch.
Diffstat (limited to 'Block.cpp')
| -rw-r--r-- | Block.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -106,7 +106,7 @@ void Block::Draw(){ correctBlockForSegmetOffset( drawx, drawy, drawz);
- correctBlockForRotation( drawx, drawy, drawz);
+ correctBlockForRotation( drawx, drawy, drawz, ownerSegment->rotation);
int32_t viewx = drawx;
int32_t viewy = drawy;
int32_t viewz = drawz;
@@ -165,10 +165,10 @@ 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, this);
}
else
- spriteobject->draw_world(x, y, z);
+ spriteobject->draw_world(x, y, z, this);
}
}
@@ -198,7 +198,7 @@ void Block::Draw(){ {
spriteobject->set_size(SPRITEWIDTH, SPRITEHEIGHT);
spriteobject->set_tile_layout(RAMPBOTTOMTILE);
- spriteobject->draw_world(x, y, z, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
+ spriteobject->draw_world(x, y, z, this, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
}
spriteobject->set_tile_layout(BLOCKTILE);
}
@@ -244,7 +244,7 @@ void Block::Draw(){ c_block_tree * vegetationsprite = 0;
vegetationsprite = getVegetationTree(contentLoader.grassConfigs,grassmat,true,true);
if(vegetationsprite)
- vegetationsprite->draw_world(x, y, z);
+ vegetationsprite->draw_world(x, y, z, this);
}
@@ -264,7 +264,7 @@ void Block::Draw(){ for(uint32_t i=0; i < building.sprites.size(); i++)
{
spriteobject = &building.sprites[i];
- spriteobject->draw_world(x, y, z);
+ spriteobject->draw_world(x, y, z, this);
}
}
@@ -283,9 +283,9 @@ void Block::Draw(){ if(spriteobject->get_sheetindex() != INVALID_INDEX && spriteobject->get_sheetindex() != UNCONFIGURED_INDEX)
{
if (mirrored)
- spriteobject->draw_world_offset(x, y, z, 1);
+ spriteobject->draw_world_offset(x, y, z, this, 1);
else
- spriteobject->draw_world(x, y, z);
+ spriteobject->draw_world(x, y, z, this);
}
//up part
@@ -293,9 +293,9 @@ void Block::Draw(){ if(spriteobject->get_sheetindex() != INVALID_INDEX && spriteobject->get_sheetindex() != UNCONFIGURED_INDEX)
{
if (mirrored)
- spriteobject->draw_world_offset(x, y, z, 1);
+ spriteobject->draw_world_offset(x, y, z, this, 1);
else
- spriteobject->draw_world(x, y, z);
+ spriteobject->draw_world(x, y, z, this);
}
}
@@ -317,7 +317,7 @@ void Block::Draw(){ }
else
{
- spriteobject->draw_world(x, y, z, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
+ spriteobject->draw_world(x, y, z, this, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
}
}
@@ -327,11 +327,11 @@ void Block::Draw(){ //if(waterlevel == 7) waterlevel--;
if(water.type == 0)
{
- contentLoader.water[water.index-1].sprite.draw_world(x, y, z, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
+ contentLoader.water[water.index-1].sprite.draw_world(x, y, z, this, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
}
else
{
- contentLoader.lava[water.index-1].sprite.draw_world(x, y, z, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
+ contentLoader.lava[water.index-1].sprite.draw_world(x, y, z, this, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
}
}
@@ -340,7 +340,7 @@ void Block::Draw(){ // (no guarantee it is the right one)
if(creaturePresent)
{
- DrawCreature(drawx, drawy, creature);
+ DrawCreature(drawx, drawy, creature, this);
}
//second part of snow
@@ -421,7 +421,7 @@ void Block::Drawcreaturetext(){ int32_t drawz = z; //- ownerSegment->sizez + 1;
correctBlockForSegmetOffset( drawx, drawy, drawz);
- correctBlockForRotation( drawx, drawy, drawz);
+ correctBlockForRotation( drawx, drawy, drawz, ownerSegment->rotation);
pointToScreen((int*)&drawx, (int*)&drawy, drawz);
drawx -= TILEWIDTH>>1;
@@ -458,7 +458,7 @@ void Block::DrawRamptops(){ 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->draw_world(x, y, z, this, (chopThisBlock && this->z == ownerSegment->z + ownerSegment->sizez -2));
spriteobject->set_offset(0, 0);
}
spriteobject->set_tile_layout(BLOCKTILE);
|
