summaryrefslogtreecommitdiff
path: root/Block.h
diff options
context:
space:
mode:
authorKris Parker2009-12-10 12:30:22 +0000
committerKris Parker2009-12-10 12:30:22 +0000
commitafba6ea721bc363502f07826d2c0cfb184e447fa (patch)
treed8bc5cdbde815131315838ed170b1c47d7c4f618 /Block.h
parent35ea344b23fa77945fcf8a267e04cc2494e71a36 (diff)
downloadstonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.gz
stonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.bz2
stonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.xz
Merge terrain config to the trunk
Diffstat (limited to 'Block.h')
-rw-r--r--Block.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Block.h b/Block.h
index b9e4267..474d6af 100644
--- a/Block.h
+++ b/Block.h
@@ -19,7 +19,7 @@ public:
int floorType;
int wallType;
int stairType;
- int materialIndex;
+ t_matglossPair material;
bool depthBorderNorth;
bool depthBorderWest;
@@ -38,7 +38,7 @@ public:
vector<t_SpriteWithOffset> sprites;
uint32_t index;
} building;
-
+
bool IsVisible(){
return (floorType || wallType) != 0;
}
@@ -55,4 +55,4 @@ bool hasWall(Block* b);
bool hasBuildingOfID(Block* b, int ID);
bool hasBuildingIdentity(Block* b, uint32_t index, int buildingOcc);
bool hasBuildingOfIndex(Block* b, uint32_t index);
-bool wallShouldNotHaveBorders( int in ); \ No newline at end of file
+bool wallShouldNotHaveBorders( int in );