From f08481a88e083c4cda2465dd74bf442915c395ae Mon Sep 17 00:00:00 2001 From: jacob1 Date: Mon, 17 Dec 2012 18:42:41 -0500 Subject: [PATCH] fix TRON ignoring GOO until the last moment --- src/simulation/elements/TRON.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simulation/elements/TRON.cpp b/src/simulation/elements/TRON.cpp index c995733b9..51f1f7365 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; }