summaryrefslogtreecommitdiff
path: root/src/simulation/elements/HFLM.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-03 00:18:39 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-03 00:18:39 (GMT)
commit4233bc743c272b9c60a16928ed49bbddaf635a98 (patch)
treec9b935383e1503221e58770b63fff04adfe5ce7e /src/simulation/elements/HFLM.cpp
parentfbaf149a92921af7ae8e59033751163b985e3bf8 (diff)
downloadpowder-4233bc743c272b9c60a16928ed49bbddaf635a98.zip
powder-4233bc743c272b9c60a16928ed49bbddaf635a98.tar.gz
Use HFLM colour data, addresses some of issue #41
Diffstat (limited to 'src/simulation/elements/HFLM.cpp')
-rw-r--r--src/simulation/elements/HFLM.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/simulation/elements/HFLM.cpp b/src/simulation/elements/HFLM.cpp
index dcd9f9a..e4fb3b4 100644
--- a/src/simulation/elements/HFLM.cpp
+++ b/src/simulation/elements/HFLM.cpp
@@ -1,4 +1,9 @@
#include "simulation/Elements.h"
+extern "C"
+{
+ #include "hmap.h"
+}
+
//#TPT-Directive ElementClass Element_HFLM PT_HFLM 68
Element_HFLM::Element_HFLM()
{
@@ -51,9 +56,9 @@ int Element_HFLM::graphics(GRAPHICS_FUNC_ARGS)
{
int caddress = restrict_flt(restrict_flt((float)((int)(cpart->life/2)), 0.0f, 200.0f)*3, 0.0f, (200.0f*3)-3);
- *colr = 0;//(unsigned char)hflm_data[caddress];
- *colg = 0;//(unsigned char)hflm_data[caddress+1];
- *colb = 0;//(unsigned char)hflm_data[caddress+2];
+ *colr = (unsigned char)hflm_data[caddress];
+ *colg = (unsigned char)hflm_data[caddress+1];
+ *colb = (unsigned char)hflm_data[caddress+2];
*firea = 255;
*firer = *colr;