summaryrefslogtreecommitdiff
path: root/ConditionalSprite.h
diff options
context:
space:
mode:
authorJonas Ask2009-10-21 13:41:50 +0000
committerJonas Ask2009-10-21 13:41:50 +0000
commit81148ebf643ceec72fc23a7e5c03f4fa00d536f7 (patch)
tree0ab588c0f9b2e87ed9224414b9fc7825b70413e4 /ConditionalSprite.h
parentcc640909fa812d19dcfdb11664f5a3223487a608 (diff)
downloadstonesense-81148ebf643ceec72fc23a7e5c03f4fa00d536f7.tar.gz
stonesense-81148ebf643ceec72fc23a7e5c03f4fa00d536f7.tar.bz2
stonesense-81148ebf643ceec72fc23a7e5c03f4fa00d536f7.tar.xz
Building sprite conditions are now stackable. This means any sprite can have any number of conditions assigned
Diffstat (limited to 'ConditionalSprite.h')
-rw-r--r--ConditionalSprite.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/ConditionalSprite.h b/ConditionalSprite.h
index efd6018..42d88de 100644
--- a/ConditionalSprite.h
+++ b/ConditionalSprite.h
@@ -1,20 +1,14 @@
#pragma once
+#include "BlockCondition.h"
+
class ConditionalSprite
{
private:
- bool matchPosition(Block* b);
- bool matchMaterialType(Block* b);
- bool matchNeighbourHasWall(Block* b);
public:
int spriteIndex;
-
- int cMaterialType;
- int cMaterialIndex;
- bool cOnWesternEdge;
- int cPositionIndex;
- dirTypes cNeighbourHasWall;
+ vector<BlockCondition> conditions;
ConditionalSprite(void);