zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-26 06:01:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2015-04-01 11:59:57 +02:00
commit bf490d8dcd
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/v_video.cpp
View file

@ -1245,7 +1245,7 @@ void DFrameBuffer::GetHitlist(BYTE *hitlist)
FTextureID pic = frame->Texture[k]; FTextureID pic = frame->Texture[k];
if (pic.isValid()) if (pic.isValid())
{ {
hitlist[pic.GetIndex()] = HIT_Sprite; hitlist[pic.GetIndex()] = FTextureManager::HIT_Sprite;
} }
} }
} }
@ -1257,14 +1257,14 @@ void DFrameBuffer::GetHitlist(BYTE *hitlist)
for (i = numsectors - 1; i >= 0; i--) for (i = numsectors - 1; i >= 0; i--)
{ {
hitlist[sectors[i].GetTexture(sector_t::floor).GetIndex()] = hitlist[sectors[i].GetTexture(sector_t::floor).GetIndex()] =
hitlist[sectors[i].GetTexture(sector_t::ceiling).GetIndex()] |= HIT_Flat; hitlist[sectors[i].GetTexture(sector_t::ceiling).GetIndex()] |= FTextureManager::HIT_Flat;
} }
for (i = numsides - 1; i >= 0; i--) for (i = numsides - 1; i >= 0; i--)
{ {
hitlist[sides[i].GetTexture(side_t::top).GetIndex()] = hitlist[sides[i].GetTexture(side_t::top).GetIndex()] =
hitlist[sides[i].GetTexture(side_t::mid).GetIndex()] = hitlist[sides[i].GetTexture(side_t::mid).GetIndex()] =
hitlist[sides[i].GetTexture(side_t::bottom).GetIndex()] |= HIT_Wall; hitlist[sides[i].GetTexture(side_t::bottom).GetIndex()] |= FTextureManager::HIT_Wall;
} }
// Sky texture is always present. // Sky texture is always present.
@ -1276,11 +1276,11 @@ void DFrameBuffer::GetHitlist(BYTE *hitlist)
if (sky1texture.isValid()) if (sky1texture.isValid())
{ {
hitlist[sky1texture.GetIndex()] |= HIT_Sky; hitlist[sky1texture.GetIndex()] |= FTextureManager::HIT_Sky;
} }
if (sky2texture.isValid()) if (sky2texture.isValid())
{ {
hitlist[sky2texture.GetIndex()] |= HIT_Sky; hitlist[sky2texture.GetIndex()] |= FTextureManager::HIT_Sky;
} }
} }