diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-20 15:27:18 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-20 15:27:18 (GMT) |
| commit | 35f84a09422e5243432530e6239bfc3de5e9846c (patch) | |
| tree | 27eef690fbb6bb8908bac0848fa76f12361b2518 /src/simulation/elements/VIBR.cpp | |
| parent | 826b966668fe37d836de91cf29a6db0d1afee1f4 (diff) | |
| parent | d29b001d82547e3c2f2e5ef4cf30b84ce59934b7 (diff) | |
| download | powder-35f84a09422e5243432530e6239bfc3de5e9846c.zip powder-35f84a09422e5243432530e6239bfc3de5e9846c.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/simulation/elements/VIBR.cpp')
| -rw-r--r-- | src/simulation/elements/VIBR.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |