OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source 
# Conflicts:
#	src/r_segs.cpp
#	src/v_draw.cpp
This commit is contained in:
Rachael Alexanderson 2016-11-05 23:38:50 -04:00
commit 5e547e9455
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/r_segs.cpp
View file

@ -1225,7 +1225,7 @@ void wallscan_drawcol1(int x, int y1, int y2, WallscanSampler &sampler, DWORD(*d
}
else
{
if (sampler.uv_max == 0) // power of two
if (sampler.uv_max == 0 || sampler.uv_step == 0) // power of two
{
int count = y2 - y1;
@ -1300,7 +1300,7 @@ void wallscan_drawcol4(int x, int y1, int y2, WallscanSampler *sampler, void(*dr
}
else
{
if (sampler[0].uv_max == 0) // power of two, no wrap handling needed
if (sampler[0].uv_max == 0 || sampler[0].uv_step == 0) // power of two, no wrap handling needed
{
int count = y2 - y1;
for (int i = 0; i < 4; i++)