summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/fire.c8
-rw-r--r--src/elements/lava.c4
-rw-r--r--src/elements/neut.c2
-rw-r--r--src/elements/newgraphics.c26
-rw-r--r--src/elements/plsm.c8
5 files changed, 24 insertions, 24 deletions
diff --git a/src/elements/fire.c b/src/elements/fire.c
index 375010a..391c743 100644
--- a/src/elements/fire.c
+++ b/src/elements/fire.c
@@ -8,12 +8,12 @@ int graphics_FIRE(GRAPHICS_FUNC_ARGS)
*colb = (unsigned char)flm_data[caddress+2];
*firea = 255;
- *firer = *colr/8;
- *fireg = *colg/8;
- *fireb = *colb/8;
+ *firer = *colr;
+ *fireg = *colg;
+ *fireb = *colb;
*pixel_mode = PMODE_NONE; //Clear default, don't draw pixel
*pixel_mode |= FIRE_ADD;
//Returning 0 means dynamic, do not cache
return 0;
-} \ No newline at end of file
+}
diff --git a/src/elements/lava.c b/src/elements/lava.c
index 873b175..a748cf7 100644
--- a/src/elements/lava.c
+++ b/src/elements/lava.c
@@ -8,7 +8,7 @@ int graphics_LAVA(GRAPHICS_FUNC_ARGS)
if (*colr>255) *colr = 255;
if (*colg>192) *colg = 192;
if (*colb>128) *colb = 128;
- *firea = 5;
+ *firea = 40;
*firer = *colr;
*fireg = *colg;
*fireb = *colb;
@@ -16,4 +16,4 @@ int graphics_LAVA(GRAPHICS_FUNC_ARGS)
*pixel_mode |= PMODE_BLUR;
//Returning 0 means dynamic, do not cache
return 0;
-} \ No newline at end of file
+}
diff --git a/src/elements/neut.c b/src/elements/neut.c
index 0dfc2b1..78552d5 100644
--- a/src/elements/neut.c
+++ b/src/elements/neut.c
@@ -135,7 +135,7 @@ int update_NEUT(UPDATE_FUNC_ARGS) {
int graphics_NEUT(GRAPHICS_FUNC_ARGS)
{
- *firea = 15;
+ *firea = 120;
*firer = 10;
*fireg = 80;
*fireb = 120;
diff --git a/src/elements/newgraphics.c b/src/elements/newgraphics.c
index 21d7334..6f941e0 100644
--- a/src/elements/newgraphics.c
+++ b/src/elements/newgraphics.c
@@ -114,7 +114,7 @@ int graphics_DUST(GRAPHICS_FUNC_ARGS)
*colg = (a*((parts[i].dcolour>>8)&0xFF) + (255-a)**colg) >> 8;
*colb = (a*((parts[i].dcolour)&0xFF) + (255-a)**colb) >> 8;
}
- *firea = 64;
+ *firea = 255;
*firer = *colr;
*fireg = *colg;
*fireb = *colb;
@@ -165,7 +165,7 @@ int graphics_WIFI(GRAPHICS_FUNC_ARGS)
}
int graphics_PRTI(GRAPHICS_FUNC_ARGS)
{
- *firea = 1;
+ *firea = 8;
*firer = 255;
*fireg = 0;
*fireb = 0;
@@ -176,7 +176,7 @@ int graphics_PRTI(GRAPHICS_FUNC_ARGS)
}
int graphics_PRTO(GRAPHICS_FUNC_ARGS)
{
- *firea = 1;
+ *firea = 8;
*firer = 0;
*fireg = 0;
*fireb = 255;
@@ -204,9 +204,9 @@ int graphics_BIZR(GRAPHICS_FUNC_ARGS) //BIZR, BIZRG, BIZRS
if(fabs(parts[i].vx)+fabs(parts[i].vy)>0)
{
*firea = 255;
- *fireg = *colg/40 * fabs(parts[i].vx)+fabs(parts[i].vy);
- *fireb = *colb/40 * fabs(parts[i].vx)+fabs(parts[i].vy);
- *firer = *colr/40 * fabs(parts[i].vx)+fabs(parts[i].vy);
+ *fireg = *colg/5 * fabs(parts[i].vx)+fabs(parts[i].vy);
+ *fireb = *colb/5 * fabs(parts[i].vx)+fabs(parts[i].vy);
+ *firer = *colr/5 * fabs(parts[i].vx)+fabs(parts[i].vy);
*pixel_mode |= FIRE_ADD;
}
return 0;
@@ -374,7 +374,7 @@ int graphics_SWCH(GRAPHICS_FUNC_ARGS)
}
int graphics_THDR(GRAPHICS_FUNC_ARGS)
{
- *firea = 20;
+ *firea = 160;
*fireg = 192;
*fireb = 255;
*firer = 144;
@@ -480,9 +480,9 @@ int graphics_HFLM(GRAPHICS_FUNC_ARGS)
*colb = (unsigned char)hflm_data[caddress+2];
*firea = 255;
- *firer = *colr/8;
- *fireg = *colg/8;
- *fireb = *colb/8;
+ *firer = *colr;
+ *fireg = *colg;
+ *fireb = *colb;
*pixel_mode = PMODE_NONE; //Clear default, don't draw pixel
*pixel_mode |= FIRE_ADD;
@@ -505,9 +505,9 @@ int graphics_FIRW(GRAPHICS_FUNC_ARGS)
}
*firea = 255;
- *firer = *colr/8;
- *fireg = *colg/8;
- *fireb = *colb/8;
+ *firer = *colr;
+ *fireg = *colg;
+ *fireb = *colb;
*pixel_mode = PMODE_NONE; //Clear default, don't draw pixel
*pixel_mode |= FIRE_ADD;
diff --git a/src/elements/plsm.c b/src/elements/plsm.c
index e7906af..3bab693 100644
--- a/src/elements/plsm.c
+++ b/src/elements/plsm.c
@@ -8,12 +8,12 @@ int graphics_PLSM(GRAPHICS_FUNC_ARGS)
*colb = (unsigned char)plasma_data[caddress+2];
*firea = 255;
- *firer = *colr/8;
- *fireg = *colg/8;
- *fireb = *colb/8;
+ *firer = *colr;
+ *fireg = *colg;
+ *fireb = *colb;
*pixel_mode = PMODE_NONE; //Clear default, don't draw pixel
*pixel_mode |= FIRE_ADD;
//Returning 0 means dynamic, do not cache
return 0;
-} \ No newline at end of file
+}