diff options
| author | jacob1 <jfu614@gmail.com> | 2012-12-17 23:42:41 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-12-17 23:42:41 (GMT) |
| commit | f08481a88e083c4cda2465dd74bf442915c395ae (patch) | |
| tree | e86b981c45422dcbf91c2a367917fefc23b0d1b6 /src | |
| parent | 9c6f3c7fbb45d458169769b48154277e9e49ff60 (diff) | |
| download | powder-f08481a88e083c4cda2465dd74bf442915c395ae.zip powder-f08481a88e083c4cda2465dd74bf442915c395ae.tar.gz | |
fix TRON ignoring GOO until the last moment
Diffstat (limited to 'src')
| -rw-r--r-- | src/simulation/elements/TRON.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/TRON.cpp b/src/simulation/elements/TRON.cpp index c995733..51f1f73 100644 --- a/src/simulation/elements/TRON.cpp +++ b/src/simulation/elements/TRON.cpp @@ -262,7 +262,7 @@ bool Element_TRON::canmovetron(Simulation * sim, int r, int len) { if (!r || ((r&0xFF) == PT_SWCH && sim->parts[r>>8].life >= 10) || ((r&0xFF) == PT_INVIS && sim->parts[r>>8].tmp == 1)) return true; - if (((sim->elements[r&0xFF].Properties & PROP_LIFE_KILL_DEC) || ((sim->elements[r&0xFF].Properties & PROP_LIFE_KILL) && (sim->elements[r&0xFF].Properties & PROP_LIFE_DEC))) && sim->parts[r>>8].life < len) + if ((((sim->elements[r&0xFF].Properties & PROP_LIFE_KILL_DEC) && sim->parts[r>>8].life > 0)|| ((sim->elements[r&0xFF].Properties & PROP_LIFE_KILL) && (sim->elements[r&0xFF].Properties & PROP_LIFE_DEC))) && sim->parts[r>>8].life < len) return true; return false; } |