diff options
| author | Japa | 2011-03-01 19:07:36 +0000 |
|---|---|---|
| committer | Japa | 2011-03-01 19:07:36 +0000 |
| commit | 2ba67112deeb2d38c4070fa46b90855c3b827ff3 (patch) | |
| tree | b6a14aee609c06feb768e4e211a6dd25b74cd3f2 /Block.cpp | |
| parent | 1baec40c25797cbe6a3274b2e142aaeb7291c5ab (diff) | |
| download | stonesense-2ba67112deeb2d38c4070fa46b90855c3b827ff3.tar.gz stonesense-2ba67112deeb2d38c4070fa46b90855c3b827ff3.tar.bz2 stonesense-2ba67112deeb2d38c4070fa46b90855c3b827ff3.tar.xz | |
brought in a new DFhack.
Fog of war is now automatic with respect to weather or not a creature is being directly controlled.
Crashes when travelling in adventure mode have gone from Always to Occasional.
Diffstat (limited to 'Block.cpp')
| -rw-r--r-- | Block.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
@@ -212,6 +212,20 @@ void Block::Draw(){ spriteobject->set_tile_layout(BLOCKTILE);
}
+ //Grass
+ if(this->grasslevel > 0 && (
+ (tileTypeTable[this->floorType].m == GRASS) ||
+ (tileTypeTable[this->floorType].m == GRASS2) ||
+ (tileTypeTable[this->floorType].m == GRASS_DEAD) ||
+ (tileTypeTable[this->floorType].m == GRASS_DRY)))
+ {
+ c_block_tree * vegetationsprite = 0;
+ vegetationsprite = getVegetationTree(contentLoader.grassConfigs,grassmat,true,true);
+ if(vegetationsprite)
+ vegetationsprite->draw_world(x, y, z, this);
+ }
+
+
drawFloorBlood ( this, drawx, drawy );
//first part of snow
if(ramp.type == 0 && wallType == 0 && stairType == 0 && defaultSnow)
@@ -243,18 +257,6 @@ void Block::Draw(){ // vegetationsprite->draw_world(x, y, z);
//}
- //Grass
- if(this->grasslevel > 0 && (
- (tileTypeTable[this->floorType].m == GRASS) ||
- (tileTypeTable[this->floorType].m == GRASS2) ||
- (tileTypeTable[this->floorType].m == GRASS_DEAD) ||
- (tileTypeTable[this->floorType].m == GRASS_DRY)))
- {
- c_block_tree * vegetationsprite = 0;
- vegetationsprite = getVegetationTree(contentLoader.grassConfigs,grassmat,true,true);
- if(vegetationsprite)
- vegetationsprite->draw_world(x, y, z, this);
- }
//shadow
|
