diff options
| author | jacob1 <jfu614@gmail.com> | 2012-12-06 16:01:46 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-12-06 16:01:46 (GMT) |
| commit | 122599763ef9827d7aadc0fe0295c2fbc96e82ab (patch) | |
| tree | dcf0a21b20cd38a12dee93d9db6115da6c0fdb35 /src/simulation/elements/VIBR.cpp | |
| parent | 2d7ac84c1dca8521f41cf023774b7a90e300b3bf (diff) | |
| parent | 9bf5eeeef919260458637e84f3388b4d7d8204c5 (diff) | |
| download | powder-122599763ef9827d7aadc0fe0295c2fbc96e82ab.zip powder-122599763ef9827d7aadc0fe0295c2fbc96e82ab.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/simulation/elements/VIBR.cpp')
| -rw-r--r-- | src/simulation/elements/VIBR.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/elements/VIBR.cpp b/src/simulation/elements/VIBR.cpp index 68119f7..7a8c30c 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); |