summaryrefslogtreecommitdiff
path: root/Block.cpp
diff options
context:
space:
mode:
authorJapa2011-02-19 17:02:15 +0000
committerJapa2011-02-19 17:02:15 +0000
commitd8523cd32f9aea85ce0ef0c6fb12c8562922dad2 (patch)
treef43d02a6f601c331e5a042dcdad1488822f61456 /Block.cpp
parent5bebc22aca35d42ee3679a72b8470482390d4064 (diff)
parent4a8f5cb3b63e33436d56a94d22ea535620756251 (diff)
downloadstonesense-d8523cd32f9aea85ce0ef0c6fb12c8562922dad2.tar.gz
stonesense-d8523cd32f9aea85ce0ef0c6fb12c8562922dad2.tar.bz2
stonesense-d8523cd32f9aea85ce0ef0c6fb12c8562922dad2.tar.xz
merged in the multi-tile tree branch.
Diffstat (limited to 'Block.cpp')
-rw-r--r--Block.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/Block.cpp b/Block.cpp
index 528850e..a96d12b 100644
--- a/Block.cpp
+++ b/Block.cpp
@@ -46,6 +46,7 @@ Block::Block(WorldSegment* ownerSegment)
this->material.type = INVALID_INDEX;
this->material.index = INVALID_INDEX;
+ creature = 0;
}
@@ -225,13 +226,13 @@ void Block::Draw(){
}
- //vegetation
- if(tree.index > 0 || tree.type > 0){
- c_sprite * vegetationsprite = 0;
- vegetationsprite = GetSpriteVegetation( (TileClass) getVegetationType( this->floorType ), tree.index );
- if(vegetationsprite)
- vegetationsprite->draw_world(x, y, z);
- }
+ ////vegetation
+ //if(tree.index > 0 || tree.type > 0){
+ // c_sprite * vegetationsprite = 0;
+ // vegetationsprite = GetSpriteVegetation( (TileClass) getVegetationType( this->floorType ), tree.index );
+ // if(vegetationsprite)
+ // vegetationsprite->draw_world(x, y, z);
+ //}
//Grass
if(this->grasslevel > 0 && (
@@ -240,8 +241,8 @@ void Block::Draw(){
(tileTypeTable[this->floorType].m == GRASS_DEAD) ||
(tileTypeTable[this->floorType].m == GRASS_DRY)))
{
- c_sprite * vegetationsprite = 0;
- vegetationsprite = getVegetationSprite(contentLoader.grassConfigs,grassmat,true,true);
+ c_block_tree * vegetationsprite = 0;
+ vegetationsprite = getVegetationTree(contentLoader.grassConfigs,grassmat,true,true);
if(vegetationsprite)
vegetationsprite->draw_world(x, y, z);
}
@@ -260,8 +261,6 @@ void Block::Draw(){
if(building.info.type != BUILDINGTYPE_NA && !skipBuilding)
{
- int spriteNum = SPRITEOBJECT_NA; //getBuildingSprite(this->building, mirroredBuilding);
-
for(uint32_t i=0; i < building.sprites.size(); i++)
{
spriteobject = &building.sprites[i];