summaryrefslogtreecommitdiff
path: root/src/elements/O2.c
diff options
context:
space:
mode:
authorJacob1 <jfu614@gmail.com>2012-06-21 22:01:32 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2012-06-22 23:10:39 (GMT)
commit287822229fec43c49f6952797ac249b4558fcb26 (patch)
treeffe0efab7e09db3b062cbd4f9570a049656b1d55 /src/elements/O2.c
parent135e91b84dbc2c49319e73bce63aab2d7a22eb71 (diff)
downloadpowder-287822229fec43c49f6952797ac249b4558fcb26.zip
powder-287822229fec43c49f6952797ac249b4558fcb26.tar.gz
fix compression during fusion
Conflicts: src/powder.c
Diffstat (limited to 'src/elements/O2.c')
-rw-r--r--src/elements/O2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/elements/O2.c b/src/elements/O2.c
index 8b9cece..37dcd8d 100644
--- a/src/elements/O2.c
+++ b/src/elements/O2.c
@@ -49,14 +49,14 @@ int update_O2(UPDATE_FUNC_ARGS)
if (rand()%5 < 1)
{
int j;
- part_change_type(i,x,y,PT_PLSM);
- parts[i].life = rand()%150+50;
+ create_part(i,x,y,PT_BRMT);
+
j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = 15000;
j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) parts[j].temp = 15000;
- j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_BRMT); if (j != -1) parts[j].temp = 15000;
- j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_SING); if (j != -1) { parts[j].temp = 15000; parts[i].life = rand()%25+50; }
+ j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = 15000;
+ if (rand()%5 < 2) { j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_SING); if (j != -1) { parts[j].temp = 15000; parts[i].life = rand()%25+50; } }
- parts[i].temp += 15000;
+ parts[i].temp = 15000;
pv[y/CELL][x/CELL] += 300;
}
}