summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-01-05 19:12:31 (GMT)
committer Cracker64 <cracker642@gmail.com>2011-01-05 19:12:31 (GMT)
commitcf2489916c6055327f9def21ee70088f4023a384 (patch)
tree609eef77a6e9543cb0d553d828e68acabedfd303 /src
parentfd2f0c905be873dc3892086850744f18c068e4be (diff)
downloadpowder-cf2489916c6055327f9def21ee70088f4023a384.zip
powder-cf2489916c6055327f9def21ee70088f4023a384.tar.gz
some ARAY changes so that more complex things can be made, http://powdertoy.co.uk/Browse/View.html?ID=103300
Diffstat (limited to 'src')
-rw-r--r--src/powder.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c
index f26db35..b21e113 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -2128,7 +2128,7 @@ void update_particles_i(pixel *vid, int start, int inc)
}
else if(parts[r>>8].type==PT_FILT){
colored = parts[r>>8].ctype;
- }else if(parts[r>>8].type!=PT_INWR && parts[r>>8].type!=PT_ARAY) {
+ }else if(parts[r>>8].type!=PT_INWR && parts[r>>8].type!=PT_ARAY && parts[r>>8].type!=PT_WIFI) {
if(nyy!=0 || nxx!=0){
create_part(-1, x+nxi+nxx, y+nyi+nyy, PT_SPRK);
}
@@ -2138,6 +2138,8 @@ void update_particles_i(pixel *vid, int start, int inc)
if(parts[r>>8].type==PT_BRAY){
parts[r>>8].life = 1;
docontinue = 1;
+ } else if(parts[r>>8].type==PT_INWR || parts[r>>8].type==PT_ARAY || parts[r>>8].type==PT_WIFI) {
+ docontinue = 1;
} else {
docontinue = 0;
}
@@ -3372,6 +3374,12 @@ void update_particles_i(pixel *vid, int start, int inc)
parts[r>>8].ctype = PT_PSCN;
parts[r>>8].life = 4;
}
+ else if(parts[r>>8].type==PT_INWR&&parts[r>>8].life==0 && wireless[parts[i].tmp][0])
+ {
+ parts[r>>8].type = PT_SPRK;
+ parts[r>>8].ctype = PT_INWR;
+ parts[r>>8].life = 4;
+ }
else if(parts[r>>8].type==PT_SPRK && parts[r>>8].ctype!=PT_NSCN && parts[r>>8].life>=3 && !wireless[parts[i].tmp][0])
{
//parts[r>>8].type = parts[r>>8].ctype;