summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-08-29 12:34:59 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-08-29 12:34:59 (GMT)
commit9c458b885112c28af8a3b7c7964e563692620c32 (patch)
treea5b7a661db5fc5845baf75ab3b1db2169f2cc181 /src/elements
parent65445c51f11d9f7d0db626c0797a622294da67ce (diff)
downloadpowder-9c458b885112c28af8a3b7c7964e563692620c32.zip
powder-9c458b885112c28af8a3b7c7964e563692620c32.tar.gz
Some element interactions for CBNW and CO2, also fixes Gas only wall
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/cbnw.c2
-rw-r--r--src/elements/co2.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/elements/cbnw.c b/src/elements/cbnw.c
index 7329f96..701f9ae 100644
--- a/src/elements/cbnw.c
+++ b/src/elements/cbnw.c
@@ -32,7 +32,7 @@ int update_CBNW(UPDATE_FUNC_ARGS) {
if ((r&0xFF)==PT_SALT && parts[i].tmp == 0 && 1>(rand()%250))
{
//Start explode
- parts[i].tmp = (rand()%100)+50;
+ parts[i].tmp = rand()%50;//(rand()%100)+50;
}
if ((r&0xFF)==PT_CBNW)
{
diff --git a/src/elements/co2.c b/src/elements/co2.c
index e9114a8..afe4af3 100644
--- a/src/elements/co2.c
+++ b/src/elements/co2.c
@@ -16,11 +16,11 @@ int update_CO2(UPDATE_FUNC_ARGS) {
return 1;
}
}
- /*if ((r&0xFF)==PT_CNCT && 1>(rand()%500)) Concrete+Water to paste, not very popular
+ if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW) && 1>(rand()%250))
{
- part_change_type(i,x,y,PT_PSTE);
+ part_change_type(i,x,y,PT_CBNW);
kill_part(r>>8);
- }*/
+ }
}
return 0;
}