From cbd402d8cb6aa699ffde83a1b5b3c2f4fc51baaf Mon Sep 17 00:00:00 2001 From: jacob1 Date: Fri, 17 May 2013 12:44:18 -0400 Subject: fix CFLM making VIBR unable to explode diff --git a/.gitignore b/.gitignore index 9ac6e38..15c661a 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,10 @@ Makefile.me *.settings *.cbp *.layout +*.config +*.creator +*.files +*.includes config.log *.sconsign.dblite *.sconf_temp diff --git a/src/simulation/elements/VIBR.cpp b/src/simulation/elements/VIBR.cpp index 0d27702..cf6d2f5 100644 --- a/src/simulation/elements/VIBR.cpp +++ b/src/simulation/elements/VIBR.cpp @@ -157,7 +157,7 @@ int Element_VIBR::update(UPDATE_FUNC_ARGS) { { if (!parts[r>>8].life) parts[r>>8].tmp += 45; - else if (parts[i].tmp2 && rand()%2) + else if (parts[i].tmp2 && parts[i].life > 75 && rand()%2) { parts[r>>8].tmp2 = 1; parts[i].tmp = 0; -- cgit v0.9.2-21-gd62e