MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed potential error with building getting transparent on un-powering.

develop
Warmist 2013-06-28 23:51:52 +03:00
parent 48f855c499
commit 0cf5eedc2a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/rendermax/renderer_light.cpp
Unescape Escape View File

@ -897,8 +897,6 @@ void lightingEngineViewscreen::doOcupancyAndLights()
buildingLightDef* def=getBuilding(bld);
if(!def)
continue;
if(def->poweredOnly && bld->isUnpowered())
continue;
if(type==df::enums::building_type::Door)
{
df::building_doorst* door=static_cast<df::building_doorst*>(bld);
@ -911,13 +909,16 @@ void lightingEngineViewscreen::doOcupancyAndLights()
{
matLightDef* mat=getMaterial(bld->mat_type,bld->mat_index);
if(!mat)mat=&matWall;
if(def->light.isEmiting)
{
addLight(tile,def->light.makeSource(def->size));
}
else if(mat->isEmiting)
if(!def->poweredOnly || !bld->isUnpowered()) //not powered. Add occlusion only.
{
addLight(tile,mat->makeSource(def->size));
if(def->light.isEmiting)
{
addLight(tile,def->light.makeSource(def->size));
}
else if(mat->isEmiting)
{
addLight(tile,mat->makeSource(def->size));
}
}
if(def->light.isTransparent)
{
@ -930,7 +931,10 @@ void lightingEngineViewscreen::doOcupancyAndLights()
}
else
{
applyMaterial(tile,def->light,def->size,def->thickness);
if(!def->poweredOnly || !bld->isUnpowered())//not powered. Add occlusion only.
addOclusion(tile,def->light.transparency,def->size);
else
applyMaterial(tile,def->light,def->size,def->thickness);
}
}
}