diff options
| author | Stanislaw Skowronek <skylark@disorder.sko> | 2013-11-16 01:16:37 (GMT) |
|---|---|---|
| committer | Stanislaw Skowronek <skylark@disorder.sko> | 2013-11-16 01:16:37 (GMT) |
| commit | 3296d01874d19e8310385c8bfc9a3a50a8319478 (patch) | |
| tree | e552ac70330e083061af0a9b3bdc6fc42b2a056f | |
| parent | 7bee414f7c11b0c4e4a3d5d4535de3999fcd8cad (diff) | |
| download | powder-3296d01874d19e8310385c8bfc9a3a50a8319478.zip powder-3296d01874d19e8310385c8bfc9a3a50a8319478.tar.gz | |
Typ00s.
| -rw-r--r-- | src/simulation/Simulation.cpp | 2 | ||||
| -rw-r--r-- | src/simulation/elements/DEST.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index e85b373..375d918 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -4449,7 +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_SPLU) parts[i].ctype &= 0x001FCE00; else if ((r & 0xFF) == PT_URAN) parts[i].ctype &= 0x003FC000; else if ((r & 0xFF) == PT_GOLD) parts[i].ctype &= 0x3C038100; diff --git a/src/simulation/elements/DEST.cpp b/src/simulation/elements/DEST.cpp index 9072f31..b13aef3 100644 --- a/src/simulation/elements/DEST.cpp +++ b/src/simulation/elements/DEST.cpp @@ -64,7 +64,7 @@ int Element_DEST::update(UPDATE_FUNC_ARGS) parts[i].life=30+rand()%20; sim->pv[y/CELL][x/CELL]+=60.0f; } - if ((r&0xFF)==PT_PLUT || r&0xFF)==PT_SPLU || (r&0xFF)==PT_DEUT) + if ((r&0xFF)==PT_PLUT || (r&0xFF)==PT_SPLU || (r&0xFF)==PT_DEUT) { sim->pv[y/CELL][x/CELL]+=20.0f; if (rand()%2) |