summaryrefslogtreecommitdiff
path: root/src/elements/elec.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2012-06-20 20:45:33 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2012-06-20 21:15:45 (GMT)
commit1d5b08194291db72c05e68eed592e8fcb6101c63 (patch)
tree39945df4b183ef2bbcaf0cc1432a3a02b547f5f6 /src/elements/elec.c
parent9b2c2a78a6f4ba4fb13f04f17a649caeaf416d8d (diff)
downloadpowder-1d5b08194291db72c05e68eed592e8fcb6101c63.zip
powder-1d5b08194291db72c05e68eed592e8fcb6101c63.tar.gz
Replace all explosion sparks with new element (EMBR)
Replaces: BOMB sparks and flash, electrons + glass sparks, sparks from IGNC, sparks from TNT explosion, and sparks from FWRK and FIRW.
Diffstat (limited to 'src/elements/elec.c')
-rw-r--r--src/elements/elec.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/elements/elec.c b/src/elements/elec.c
index 3d8471d..bafe939 100644
--- a/src/elements/elec.c
+++ b/src/elements/elec.c
@@ -34,25 +34,31 @@ int update_ELEC(UPDATE_FUNC_ARGS) {
continue;
if ((r&0xFF)==PT_GLAS)
{
- fire_r[y/CELL][x/CELL] += rand()%200; //D: Doesn't work with OpenGL, also shouldn't be here
- fire_g[y/CELL][x/CELL] += rand()%200;
- fire_b[y/CELL][x/CELL] += rand()%200;
for (rrx=-1; rrx<=1; rrx++)
{
for (rry=-1; rry<=1; rry++)
{
if (x+rx+rrx>=0 && y+ry+rry>=0 && x+rx+rrx<XRES && y+ry+rry<YRES) {
- nb = create_part(-1, x+rx+rrx, y+ry+rry, PT_BOMB);
+ nb = create_part(-1, x+rx+rrx, y+ry+rry, PT_EMBR);
if (nb!=-1) {
- parts[nb].tmp = 1;
+ parts[nb].tmp = 0;
parts[nb].life = 50;
- parts[nb].temp = 400.0f;
+ parts[nb].temp = parts[i].temp*0.8f;
parts[nb].vx = rand()%20-10;
parts[nb].vy = rand()%20-10;
}
}
}
}
+ fire_r[y/CELL][x/CELL] += rand()%200; //D: Doesn't work with OpenGL, also shouldn't be here
+ fire_g[y/CELL][x/CELL] += rand()%200;
+ fire_b[y/CELL][x/CELL] += rand()%200;
+ /* possible alternative, but doesn't work well at the moment because FIRE_ADD divides firea by 8, so the glow isn't strong enough
+ create_part(i, x, y, PT_EMBR);
+ parts[i].tmp = 2;
+ parts[i].life = 2;
+ parts[i].ctype = ((rand()%200)<<16) | ((rand()%200)<<8) | (rand()%200);
+ */
kill_part(i);
return 1;
}