summaryrefslogtreecommitdiff
path: root/src/simulation/elements/H2.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-25 15:32:51 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-25 15:32:51 (GMT)
commit9b10f0c39042885a6969324959dcd1c680a9a4d9 (patch)
tree8724a76f5743ca4c0273861e129b6c849a63ca83 /src/simulation/elements/H2.cpp
parentbd9829124b3da2b495efd642982fd8e3497c83e9 (diff)
downloadpowder-9b10f0c39042885a6969324959dcd1c680a9a4d9.zip
powder-9b10f0c39042885a6969324959dcd1c680a9a4d9.tar.gz
Revert "final fusion fixes"
This reverts commit add4226f316b2e7abd0b988ef27cb4a7ca143c31.
Diffstat (limited to 'src/simulation/elements/H2.cpp')
-rw-r--r--src/simulation/elements/H2.cpp28
1 files changed, 5 insertions, 23 deletions
diff --git a/src/simulation/elements/H2.cpp b/src/simulation/elements/H2.cpp
index 7861113..120dc1a 100644
--- a/src/simulation/elements/H2.cpp
+++ b/src/simulation/elements/H2.cpp
@@ -79,8 +79,6 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
}
if (rt==PT_FIRE || rt==PT_PLSM || rt==PT_LAVA)
{
- if(parts[r>>8].tmp&8&&rt==PT_PLSM)
- continue;
sim->create_part(i,x,y,PT_FIRE);
parts[i].temp+=(rand()%250);
parts[i].tmp |= 1;
@@ -96,27 +94,11 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
float temp = parts[i].temp;
sim->create_part(i,x,y,PT_NBLE);
- j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT);
- if (j != -1)
- parts[j].temp = temp;
- if (!(rand()%10))
- {
- j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC);
- if (j != -1)
- parts[j].temp = temp;
- }
- j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT);
- if (j != -1)
- {
- parts[j].ctype = 0xFFFF00;
- parts[j].temp = temp;
- }
- j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM);
- if (j != -1)
- {
- parts[j].temp = temp;
- parts[j].tmp |=8;
- }
+ j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = temp;
+ if (!(rand()%10)) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = temp; }
+ j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) { parts[j].ctype = 0xFFFF00; parts[j].temp = temp; }
+
+ j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = temp;
parts[i].temp = temp+750+rand()%500;
sim->pv[y/CELL][x/CELL] += 30;