summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-12-03 00:36:12 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-12-03 00:36:12 (GMT)
commit55a53a0c0f327143cad8f87daf46d188f154dd5a (patch)
treec61ab073ee0093b44867759cdc486b2e968ae7a3 /src/elements
parentcb75e1d924ee33251c65a8bc10288ddd9e978882 (diff)
downloadpowder-55a53a0c0f327143cad8f87daf46d188f154dd5a.zip
powder-55a53a0c0f327143cad8f87daf46d188f154dd5a.tar.gz
Back to old LCRY rendering
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/newgraphics.c24
1 files changed, 22 insertions, 2 deletions
diff --git a/src/elements/newgraphics.c b/src/elements/newgraphics.c
index 9af28a1..8957df9 100644
--- a/src/elements/newgraphics.c
+++ b/src/elements/newgraphics.c
@@ -355,7 +355,27 @@ int graphics_GLOW(GRAPHICS_FUNC_ARGS)
}
int graphics_LCRY(GRAPHICS_FUNC_ARGS)
{
- int lifemod = ((cpart->tmp2>10?10:cpart->tmp2)*10);
+ if(decorations_enable && cpart->dcolour && cpart->dcolour&0xFF000000)
+ {
+ *colr = (cpart->dcolour>>16)&0xFF;
+ *colg = (cpart->dcolour>>8)&0xFF;
+ *colb = (cpart->dcolour)&0xFF;
+
+ if(cpart->tmp2<10){
+ *colr /= 10-cpart->tmp2;
+ *colg /= 10-cpart->tmp2;
+ *colb /= 10-cpart->tmp2;
+ }
+
+ }
+ else
+ {
+ *colr = *colg = *colb = 0x50+((cpart->tmp2>10?10:cpart->tmp2)*10);
+ }
+ *pixel_mode |= NO_DECO;
+ return 0;
+
+ /*int lifemod = ((cpart->tmp2>10?10:cpart->tmp2)*10);
*colr += lifemod;
*colg += lifemod;
*colb += lifemod;
@@ -369,7 +389,7 @@ int graphics_LCRY(GRAPHICS_FUNC_ARGS)
*colb = (lifemod*((cpart->dcolour)&0xFF) + (255-lifemod)**colb) >> 8;
}
*pixel_mode |= NO_DECO;
- return 0;
+ return 0;*/
}
int graphics_PCLN(GRAPHICS_FUNC_ARGS)
{