summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-08-20 11:03:43 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-08-20 11:03:43 (GMT)
commit03ee03ed1e735352082fa35a06444bbf389bf9c6 (patch)
treead914c050fdca3528c0c65df71028d2d1beadd5e /src
parenta96afc863e814e0652e184614feda4d969ec2f94 (diff)
downloadpowder-03ee03ed1e735352082fa35a06444bbf389bf9c6.zip
powder-03ee03ed1e735352082fa35a06444bbf389bf9c6.tar.gz
Fix Coal invisibility when drawn on pause
Diffstat (limited to 'src')
-rw-r--r--src/graphics.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/graphics.c b/src/graphics.c
index 3c61a08..fb354d7 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -3503,16 +3503,22 @@ void draw_parts(pixel *vid)
else if(t==PT_COAL || t==PT_BCOL){
cr = PIXR(ptypes[t].pcolors);
cg = PIXG(ptypes[t].pcolors);
- cb = PIXB(ptypes[t].pcolors);
+ //cb = PIXB(ptypes[t].pcolors);
- cr += (parts[i].tmp2-273.15f)/3;
- cg += (parts[i].tmp2-273.15f)/3;
- cb += (parts[i].tmp2-273.15f)/3;
+ cr += (parts[i].tmp2-295.15f)/3;
+ //cg += (parts[i].tmp2-273.15f)/3;
+ //cb += (parts[i].tmp2-273.15f)/3;
+ if (cr>=170)
+ cr = 170;
+ if (cr<=cg)
+ cr = cg;
+
+ cg = cb = cr;
- if((parts[i].temp-273.15f) > 300.0f-200.0f)
+ if((parts[i].temp-295.15f) > 300.0f-200.0f)
{
float frequency = 3.1415/(2*300.0f-(300.0f-200.0f));
- int q = ((parts[i].temp-273.15f)>300.0f)?300.0f-(300.0f-200.0f):(parts[i].temp-273.15f)-(300.0f-200.0f);
+ int q = ((parts[i].temp-295.15f)>300.0f)?300.0f-(300.0f-200.0f):(parts[i].temp-295.15f)-(300.0f-200.0f);
cr += sin(frequency*q) * 226;
cg += sin(frequency*q*4.55 +3.14) * 34;