summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlieuwe <lieuwe@mint>2011-07-28 22:30:15 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-08-08 12:32:04 (GMT)
commit50c4bfd86d66c805097f4a12fb12ee8094cc2c5f (patch)
tree95393718a34dcb04e72deef29cb9290427d0b47f
parent15b4ba7532966da0bb9672c94c97d482271c7906 (diff)
downloadpowder-50c4bfd86d66c805097f4a12fb12ee8094cc2c5f.zip
powder-50c4bfd86d66c805097f4a12fb12ee8094cc2c5f.tar.gz
Y U NO WORK. added logic for WIRE but it's not being called.
-rw-r--r--includes/powder.h3
-rw-r--r--src/elements/wire.c32
-rw-r--r--src/graphics.c10
3 files changed, 44 insertions, 1 deletions
diff --git a/includes/powder.h b/includes/powder.h
index dd4bbd1..5954952 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -312,6 +312,7 @@ int update_PBCN(UPDATE_FUNC_ARGS);
int update_GPMP(UPDATE_FUNC_ARGS);
int update_CLST(UPDATE_FUNC_ARGS);
int update_DLAY(UPDATE_FUNC_ARGS);
+int update_WIRE(UPDATE_FUNC_ARGS);
int update_MISC(UPDATE_FUNC_ARGS);
int update_legacy_PYRO(UPDATE_FUNC_ARGS);
@@ -545,7 +546,7 @@ static const part_type ptypes[PT_NUM] =
{"PBCN", PIXPACK(0x3B1D0A), 0.0f, 0.00f * CFDS, 0.97f, 0.50f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 12, 1, 1, 100, SC_POWERED, R_TEMP+0.0f +273.15f, 251, "Powered breakable clone", ST_NONE, TYPE_SOLID, &update_PBCN},
{"GPMP", PIXPACK(0x0A3B3B), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 1, 1, 100, SC_POWERED, 0.0f +273.15f, 0, "Changes gravity to its temp when activated. (use HEAT/COOL).", ST_NONE, TYPE_SOLID, &update_GPMP},
{"CLST", PIXPACK(0xE4A4A4), 0.7f, 0.02f * CFDS, 0.94f, 0.95f, 0.0f, 0.2f, 0.00f, 0.000f * CFDS, 1, 0, 0, 2, 2, 1, 1, 55, SC_POWDERS, R_TEMP+0.0f +273.15f, 70, "Clay dust. Produces paste when mixed with water.", ST_SOLID, TYPE_PART, &update_CLST},
- {"WIRE", PIXPACK(0xFFCC00), 0.0f, 0.00f * CFDS, 0.00f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 1, 0, SC_ELEC, R_TEMP+0.0f +273.15f, 250, "WireWorld wires.",ST_SOLID,TYPE_SOLID,NULL}
+ {"WIRE", PIXPACK(0xFFCC00), 0.0f, 0.00f * CFDS, 0.00f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 1, 0, SC_ELEC, R_TEMP+0.0f +273.15f, 250, "WireWorld wires.",ST_SOLID,TYPE_SOLID,&update_WIRE}
//Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Use Weight Section H Ins Description
};
diff --git a/src/elements/wire.c b/src/elements/wire.c
new file mode 100644
index 0000000..da41bd1
--- /dev/null
+++ b/src/elements/wire.c
@@ -0,0 +1,32 @@
+#include <element.h>
+
+int update_WIRE(UPDATE_FUNC_ARGS) {
+ int s,r,rx,ry,count;
+ printf("FUCK");
+ s=pmap[y][x];
+ /*
+ 0: wire
+ 1: spark head
+ 2: spark tail
+
+ tmp is previous state, ctype is current state
+ */
+ parts[s>>8].tmp=parts[s>>8].ctype;
+ if(parts[s>>8].tmp==1){parts[s>>8].ctype=2;}
+ if(parts[s>>8].tmp==2){parts[s>>8].ctype=0;}
+
+ for(rx=-1; rx<2; rx++)
+ for(ry=-1; ry<2; ry++)
+ {
+ count=0;
+ if(x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && pmap[y+ry][x+rx] && rx==0 && ry==0 && (pmap[y+ry][x+rx]&0xFF)!=0xFF)
+ {
+ r = pmap[y+ry][x+rx];
+ if((r&0xFF)==PT_SPRK){parts[s>>8].ctype=1;}
+ if((r&0xFF)==PT_WIRE && parts[r>>8].tmp==1){count++;}
+ }
+ if(count==1 || count==2)
+ parts[s>>8].ctype=1;
+ }
+ return 0;
+}
diff --git a/src/graphics.c b/src/graphics.c
index 3cd3b8d..ed60df1 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1723,6 +1723,16 @@ void draw_parts(pixel *vid)
if ((parts[i].ctype&7) == 7)
draw_line(vid, nx, ny, (int)(parts[parts[i].tmp].x+0.5f), (int)(parts[parts[i].tmp].y+0.5f), 245, 245, 220, XRES+BARSIZE);
}
+
+ if(t==PT_WIRE)
+ {
+ if (parts[i].ctype==0)
+ blendpixel(vid, nx, ny, 255, 204, 0, 255);
+ else if(parts[i].ctype==1)
+ blendpixel(vid, nx, ny, 0, 0, 255, 255);
+ else
+ blendpixel(vid, nx, ny, 255, 255, 255, 255);
+ }
if (cmode!=CM_HEAT)
{