OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'upstream/master' into zdoom-rgb666-take2

Browse source 
# Conflicts:
#	src/r_draw_pal.cpp
This commit is contained in:
Magnus Norddahl 2016-12-23 21:27:50 +01:00
commit 8cc4c8a192
14 changed files with 261 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/r_plane.cpp
View file

@ -705,15 +705,15 @@ static void R_DrawSkyColumnStripe(int start_x, int y1, int y2, int columns, doub
angle1 = (DWORD)((UMulScale16(ang, frontcyl) + frontpos) >> FRACBITS);
angle2 = (DWORD)((UMulScale16(ang, backcyl) + backpos) >> FRACBITS);
bufplce[i] = (const BYTE *)frontskytex->GetColumn(angle1, nullptr);
bufplce2[i] = backskytex ? (const BYTE *)backskytex->GetColumn(angle2, nullptr) : nullptr;
dc_wall_source[i] = (const BYTE *)frontskytex->GetColumn(angle1, nullptr);
dc_wall_source2[i] = backskytex ? (const BYTE *)backskytex->GetColumn(angle2, nullptr) : nullptr;
vince[i] = uv_step;
vplce[i] = uv_pos;
dc_wall_iscale[i] = uv_step;
dc_wall_texturefrac[i] = uv_pos;
}
bufheight[0] = height;
bufheight[1] = backskytex ? backskytex->GetHeight() : height;
dc_wall_sourceheight[0] = height;
dc_wall_sourceheight[1] = backskytex ? backskytex->GetHeight() : height;
dc_dest = (ylookup[y1] + start_x) + dc_destorg;
dc_count = y2 - y1;