diff options
| author | jacob1 <jfu614@gmail.com> | 2012-12-18 19:08:53 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-12-18 19:08:53 (GMT) |
| commit | 771d71ea4619f30bd1b135697e83037ba333008f (patch) | |
| tree | 81952978bc16b2418d5212b76b99054116c83b69 /src/simulation/Elements.h | |
| parent | e685e30d58f252ddca3dce0d67c3d2af56ce330d (diff) | |
| download | powder-771d71ea4619f30bd1b135697e83037ba333008f.zip powder-771d71ea4619f30bd1b135697e83037ba333008f.tar.gz | |
make water equalization use flags, not tmp2 (fixes EXOT / BUBW)
Diffstat (limited to 'src/simulation/Elements.h')
| -rw-r--r-- | src/simulation/Elements.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/simulation/Elements.h b/src/simulation/Elements.h index 781a8f8..937b4cb 100644 --- a/src/simulation/Elements.h +++ b/src/simulation/Elements.h @@ -37,9 +37,10 @@ #define PROP_SPARKSETTLE 0x20000 //2^17 Allow Sparks/Embers to settle #define PROP_NOAMBHEAT 0x40000 //2^18 Don't transfer or receive heat from ambient heat. -#define FLAG_STAGNANT 1 +#define FLAG_STAGNANT 0x1 #define FLAG_SKIPMOVE 0x2 // skip movement for one frame, only implemented for PHOT -#define FLAG_MOVABLE 0x4 // if can move +#define FLAG_WATEREQUAL 0x4 +#define FLAG_MOVABLE 0x8 // if can move #define ST_NONE 0 #define ST_SOLID 1 |