diff options
| author | Stanislaw Skowronek <skylark@disorder.sko> | 2013-11-16 01:12:45 (GMT) |
|---|---|---|
| committer | Stanislaw Skowronek <skylark@disorder.sko> | 2013-11-16 01:12:45 (GMT) |
| commit | c133b7a99fea1b45ce80b6f5245a77fc886edd5d (patch) | |
| tree | 6c6b54b9f78b46da68f50890d6be27b4e2f39309 /src/simulation/Simulation.cpp | |
| parent | 76306f9260e519c098a312303e07be38860ef1f7 (diff) | |
| download | powder-c133b7a99fea1b45ce80b6f5245a77fc886edd5d.zip powder-c133b7a99fea1b45ce80b6f5245a77fc886edd5d.tar.gz | |
Solid plutonium.
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 0a24539..e85b373 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -4065,7 +4065,7 @@ void Simulation::update_particles_i(int start, int inc) parts[i].tmp = 0; t = PT_BMTL; } - if (t == PT_PLUT) + if (t == PT_PLUT || t == PT_SPLU) { parts[i].tmp = 0; t = PT_LAVA; @@ -4126,7 +4126,7 @@ void Simulation::update_particles_i(int start, int inc) parts[i].tmp--; parts[i].temp = 3500; } - if (parts[i].ctype==PT_PLUT&&parts[i].tmp>0) + if ((parts[i].ctype==PT_PLUT || parts[i].ctype==PT_SPLU)&&parts[i].tmp>0) { parts[i].tmp--; parts[i].temp = MAX_TEMP; @@ -4449,6 +4449,7 @@ killed: else if ((r & 0xFF) == PT_GOO) parts[i].ctype &= 0x3FFAAA00; else if ((r & 0xFF) == PT_PLNT) parts[i].ctype &= 0x0007C000; else if ((r & 0xFF) == PT_PLUT) parts[i].ctype &= 0x001FCE00; + else if ((r & 0xFF) == PT_SPLT) parts[i].ctype &= 0x001FCE00; else if ((r & 0xFF) == PT_URAN) parts[i].ctype &= 0x003FC000; else if ((r & 0xFF) == PT_GOLD) parts[i].ctype &= 0x3C038100; |