diff options
| author | jacob1 <jfu614@gmail.com> | 2012-11-16 01:41:38 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-11-16 01:41:38 (GMT) |
| commit | 16e4c5f7179db5beabe3065781adec7d27000cd9 (patch) | |
| tree | b4544943d893a28a9c7c2b62fbbdc36ee2c1f514 /src/simulation/elements/FIRE.cpp | |
| parent | 1e32c545d9ca7f960cdd6f77714c7b2761880478 (diff) | |
| download | powder-16e4c5f7179db5beabe3065781adec7d27000cd9.zip powder-16e4c5f7179db5beabe3065781adec7d27000cd9.tar.gz | |
save pause state in stamps, load pause state from local saves and stamps correctly, remove accidental inclusion
Diffstat (limited to 'src/simulation/elements/FIRE.cpp')
| -rw-r--r-- | src/simulation/elements/FIRE.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/simulation/elements/FIRE.cpp b/src/simulation/elements/FIRE.cpp index 538bd05..f9313fa 100644 --- a/src/simulation/elements/FIRE.cpp +++ b/src/simulation/elements/FIRE.cpp @@ -96,12 +96,6 @@ int Element_FIRE::update(UPDATE_FUNC_ARGS) (rt!=PT_SPNG || parts[r>>8].life==0) && sim->elements[rt].Flammable && (sim->elements[rt].Flammable + (int)(sim->pv[(y+ry)/CELL][(x+rx)/CELL]*10.0f))>(rand()%1000)) { - int j = sim->create_part(-1, x-1+rand()%3, y-1+rand()%3, PT_SMKE); - if (j != -1) - { - parts[r>>8].temp = restrict_flt(sim->elements[PT_FIRE].Temperature + (sim->elements[rt].Flammable/2), MIN_TEMP, MAX_TEMP); - parts[j].life = rand()%80+480; - } sim->part_change_type(r>>8,x+rx,y+ry,PT_FIRE); parts[r>>8].temp = restrict_flt(sim->elements[PT_FIRE].Temperature + (sim->elements[rt].Flammable/2), MIN_TEMP, MAX_TEMP); parts[r>>8].life = rand()%80+180; |
