diff options
| author | Japa | 2011-01-22 18:08:12 +0000 |
|---|---|---|
| committer | Japa | 2011-01-22 18:08:12 +0000 |
| commit | cfb8211141dd0c08bd54a593eb4a0e00bc1d261b (patch) | |
| tree | 93698a47d14ed9b85b33f3781e5e8cfaf9a57f07 /SpriteObjects.h | |
| parent | 61e6f6965835e4ee347de7b476b5e83db9828c39 (diff) | |
| parent | a605b652ba6f0ad551a07724059103600120aec1 (diff) | |
| download | stonesense-cfb8211141dd0c08bd54a593eb4a0e00bc1d261b.tar.gz stonesense-cfb8211141dd0c08bd54a593eb4a0e00bc1d261b.tar.bz2 stonesense-cfb8211141dd0c08bd54a593eb4a0e00bc1d261b.tar.xz | |
merged in changes from trunk.
Diffstat (limited to 'SpriteObjects.h')
| -rw-r--r-- | SpriteObjects.h | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/SpriteObjects.h b/SpriteObjects.h index 04867db..aa9afb6 100644 --- a/SpriteObjects.h +++ b/SpriteObjects.h @@ -17,6 +17,11 @@ #define OUTLINERIGHT 2
#define OUTLINEBOTTOM 3
+#define LIGHTANY 0
+#define LIGHTYES 1
+#define LIGHTNO 2
+
+
class Block;
class c_sprite
@@ -44,13 +49,27 @@ private: int mudmin;
int mudmax;
+ unsigned int waterMin : 3;
+ unsigned int waterMax : 3;
+ unsigned int waterAboveMin : 3;
+ unsigned int waterAboveMax : 3;
+ unsigned int waterBelowMin : 3;
+ unsigned int waterBelowMax : 3;
+ unsigned int waterRightMin : 3;
+ unsigned int waterRightMax : 3;
+ unsigned int waterLeftMin : 3;
+ unsigned int waterLeftMax : 3;
+ char water_direction;
+
bool needoutline;
bool randomanimation;
bool bloodsprite;
- char isoutline;
+ unsigned char isoutline : 2;
+
+ unsigned char halftile : 2;
- char halftile;
+ unsigned char light : 2;
ALLEGRO_BITMAP * defaultsheet;
@@ -62,6 +81,8 @@ private: uint8_t rampborders;
uint8_t upstairborders;
uint8_t downstairborders;
+ uint8_t lightborders;
+ uint8_t darkborders;
uint8_t notopenborders;
uint8_t notwallborders;
uint8_t notfloorborders;
@@ -90,5 +111,6 @@ public: void set_defaultsheet(ALLEGRO_BITMAP * in){ defaultsheet = in; }
void reset();
void set_tile_layout(uint8_t layout);
+ void set_needoutline( bool i ) {needoutline = i;}
bool animate;
};
\ No newline at end of file |
