diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-05 00:34:47 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-05 00:34:47 (GMT) |
| commit | 2d0ce60afe568fb129872abf674aec12cb520907 (patch) | |
| tree | 6b62d045c109311645bba83598fc4341918adbd0 /src/simulation | |
| parent | cb5ca55fc2c7160688bb1ded49dfec2db829fe37 (diff) | |
| download | powder-2d0ce60afe568fb129872abf674aec12cb520907.zip powder-2d0ce60afe568fb129872abf674aec12cb520907.tar.gz | |
fix not being able to draw TUGN under high/low pressure
Diffstat (limited to 'src/simulation')
| -rw-r--r-- | src/simulation/Simulation.cpp | 8 | ||||
| -rw-r--r-- | src/simulation/elements/DMG.cpp | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 499748d..b110b72 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -2913,11 +2913,7 @@ int Simulation::create_part(int p, int x, int y, int tv) parts[i].dcolour = 0; parts[i].flags = 0; - if (t==PT_GLAS) - { - parts[i].pavg[1] = pv[y/CELL][x/CELL]; - } - else if (t==PT_QRTZ) + if (t == PT_GLAS || t == PT_QRTZ || t == PT_TUGN) { parts[i].pavg[1] = pv[y/CELL][x/CELL]; } @@ -2983,8 +2979,6 @@ int Simulation::create_part(int p, int x, int y, int tv) parts[i].life = rand()%50+60; break; case PT_QRTZ: - parts[i].tmp = (rand()%11); - break; case PT_PQRT: parts[i].tmp = (rand()%11); break; diff --git a/src/simulation/elements/DMG.cpp b/src/simulation/elements/DMG.cpp index a796701..4f1daaf 100644 --- a/src/simulation/elements/DMG.cpp +++ b/src/simulation/elements/DMG.cpp @@ -92,6 +92,8 @@ int Element_DMG::update(UPDATE_FUNC_ARGS) sim->part_change_type(rr>>8, x+nxi, y+nxj, PT_BCOL); else if(t == PT_QRTZ) sim->part_change_type(rr>>8, x+nxi, y+nxj, PT_PQRT); + else if(t == PT_TUGN) + sim->part_change_type(rr>>8, x+nxi, y+nxj, PT_BRMT); } } } |