OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into v2.x

Browse source 
Conflicts:
	src/gl/textures/gl_material.cpp
This commit is contained in:
Christoph Oelckers 2014-09-09 01:30:11 +02:00
commit 9b8869e78d
18 changed files with 88 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/gl/scene/gl_renderhacks.cpp
View file

@ -162,7 +162,6 @@ void FDrawInfo::AddUpperMissingTexture(side_t * side, subsector_t *sub, fixed_t
return;
}
//@sync-hack
for(unsigned int i=0;i<MissingUpperTextures.Size();i++)
{
if (MissingUpperTextures[i].sub == sub)
@ -229,13 +228,12 @@ void FDrawInfo::AddLowerMissingTexture(side_t * side, subsector_t *sub, fixed_t
}
// Ignore FF_FIX's because they are designed to abuse missing textures
if (seg->backsector->e->XFloor.ffloors.Size() && seg->backsector->e->XFloor.ffloors[0]->flags&FF_FIX)
if (seg->backsector->e->XFloor.ffloors.Size() && (seg->backsector->e->XFloor.ffloors[0]->flags&(FF_FIX|FF_SEETHROUGH)) == FF_FIX)
{
totalms.Unclock();
return;
}
//@sync-hack
for(unsigned int i=0;i<MissingLowerTextures.Size();i++)
{
if (MissingLowerTextures[i].sub == sub)
@ -732,7 +730,6 @@ void FDrawInfo::AddHackedSubsector(subsector_t * sub)
{
if (!(level.maptype == MAPTYPE_HEXEN))
{
//@sync-hack (probably not, this is only called from the main thread)
SubsectorHackInfo sh={sub, 0};
SubsectorHacks.Push (sh);
}
@ -1032,13 +1029,11 @@ ADD_STAT(sectorhacks)
void FDrawInfo::AddFloorStack(sector_t * sec)
{
//@sync-hack
FloorStacks.Push(sec);
}
void FDrawInfo::AddCeilingStack(sector_t * sec)
{
//@sync-hack
CeilingStacks.Push(sec);
}