summaryrefslogtreecommitdiff
path: root/src/simulation/elements/FIRE.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2012-11-16 01:23:38 (GMT)
committer jacob1 <jfu614@gmail.com>2012-11-16 01:23:38 (GMT)
commit1e32c545d9ca7f960cdd6f77714c7b2761880478 (patch)
tree9800e5dbadcc53ed8f2c60762eb8b1abc88cb59f /src/simulation/elements/FIRE.cpp
parentbf3d7e9ad76a9c06c2f7f5771311dc8ea481dd96 (diff)
downloadpowder-1e32c545d9ca7f960cdd6f77714c7b2761880478.zip
powder-1e32c545d9ca7f960cdd6f77714c7b2761880478.tar.gz
fix visual studio std::max problem
Diffstat (limited to 'src/simulation/elements/FIRE.cpp')
-rw-r--r--src/simulation/elements/FIRE.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/simulation/elements/FIRE.cpp b/src/simulation/elements/FIRE.cpp
index f9313fa..538bd05 100644
--- a/src/simulation/elements/FIRE.cpp
+++ b/src/simulation/elements/FIRE.cpp
@@ -96,6 +96,12 @@ 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;