diff options
| author | mmbob <mmbob+github@outlook.com> | 2013-04-30 01:50:12 (GMT) |
|---|---|---|
| committer | mmbob <mmbob+github@outlook.com> | 2013-04-30 01:50:12 (GMT) |
| commit | 9d4cbd3112a6a21858054deebc76b6bf30eec6df (patch) | |
| tree | 40774e20fe7090a085c4f4be9b9f8ec2095ef6ee /src/simulation/elements/EXOT.cpp | |
| parent | e166640cbbe6d990175e835ae9ff463d9bae34f1 (diff) | |
| parent | b83043e2a6293e83d5d7fbad70a7e20b131ba33b (diff) | |
| download | powder-9d4cbd3112a6a21858054deebc76b6bf30eec6df.zip powder-9d4cbd3112a6a21858054deebc76b6bf30eec6df.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/simulation/elements/EXOT.cpp')
| -rw-r--r-- | src/simulation/elements/EXOT.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/EXOT.cpp b/src/simulation/elements/EXOT.cpp index 52bf462..8f8d874 100644 --- a/src/simulation/elements/EXOT.cpp +++ b/src/simulation/elements/EXOT.cpp @@ -70,7 +70,7 @@ int Element_EXOT::update(UPDATE_FUNC_ARGS) { } else if (rt == PT_LAVA) { - if (parts[r>>8].ctype == PT_TTAN && !(rand()%10)) + if ((parts[r>>8].ctype == PT_TTAN || parts[r>>8].ctype == PT_GOLD) && !(rand()%10)) { parts[r>>8].ctype = PT_VIBR; sim->kill_part(i); |