Merge branch 'master' of git://github.com/JapaMala/dfhack into rendermax

develop
jj 2013-06-24 01:56:32 +02:00
commit 1a5169c70c
2 changed files with 18 additions and 3 deletions

@ -170,6 +170,21 @@ void lightingEngineViewscreen::doFovs()
radius*=flicker; radius*=flicker;
power=power*flicker; power=power*flicker;
} }
int surrounds = 0;
lightCell curPower;
if(lightUpCell(curPower = power, 0, 0,i+0, j+0))
{
surrounds += lightUpCell(curPower = power, 0, 1,i+0, j+1);
surrounds += lightUpCell(curPower = power, 1, 1,i+1, j+1);
surrounds += lightUpCell(curPower = power, 1, 0,i+1, j+0);
surrounds += lightUpCell(curPower = power, 1,-1,i+1, j-1);
surrounds += lightUpCell(curPower = power, 0,-1,i+0, j-1);
surrounds += lightUpCell(curPower = power,-1,-1,i-1, j-1);
surrounds += lightUpCell(curPower = power,-1, 0,i-1, j+0);
surrounds += lightUpCell(curPower = power,-1, 1,i-1, j+1);
}
if(surrounds)
plotCircle(i,j,radius, plotCircle(i,j,radius,
std::bind(&lightingEngineViewscreen::doRay,this,power,i,j,_1,_2)); std::bind(&lightingEngineViewscreen::doRay,this,power,i,j,_1,_2));
} }

@ -1 +1 @@
Subproject commit bbbda97c1cdd3d2456097eca799cfc7cf3410aaf Subproject commit dbcc80ff364978e9e5fec13e425b0af84c403f10