From 6a4040f2b7aa86992a340f8bf5afb95011a1e989 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Fri, 23 Nov 2012 21:28:10 -0500 Subject: [PATCH] Update src/simulation/elements/VIBR.cpp fix EXOT destroying exploding VIBR --- src/simulation/elements/VIBR.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/simulation/elements/VIBR.cpp b/src/simulation/elements/VIBR.cpp index 68119f732..7a8c30c2f 100644 --- a/src/simulation/elements/VIBR.cpp +++ b/src/simulation/elements/VIBR.cpp @@ -149,7 +149,7 @@ int Element_VIBR::update(UPDATE_FUNC_ARGS) { if (!r) continue; //Melts into EXOT - if ((r&0xFF) == PT_EXOT && !(rand()%250)) + if ((r&0xFF) == PT_EXOT && !(rand()%250) && !parts[i].life) { sim->create_part(i, x, y, PT_EXOT); } @@ -163,7 +163,7 @@ int Element_VIBR::update(UPDATE_FUNC_ARGS) { parts[r>>8].tmp += 10; } //Absorbs energy particles - if ((sim->elements[r&0xFF].Properties & TYPE_ENERGY)) + if ((sim->elements[r&0xFF].Properties & TYPE_ENERGY) && !parts[i].life) { parts[i].tmp += 20; sim->kill_part(r>>8);