Merge branch 'stable' into extended-hud

Author: electricbrass

client/src/r_bsp.cpp

@@ -671,7 +671,7 @@ void R_Subsector (int num)
 
 	basecolormap = frontsector->colormap->maps;
 
-	ceilingplane = P_CeilingHeight(camera) > viewz ||
+	ceilingplane = P_CeilingHeight(viewx, viewy, frontsector) > viewz ||
 		frontsector->ceilingpic == skyflatnum ||
 		(frontsector->heightsec && 
 		!(frontsector->heightsec->MoreFlags & SECF_IGNOREHEIGHTSEC) && 
@@ -691,7 +691,7 @@ void R_Subsector (int num)
 	// killough 3/7/98: Add (x,y) offsets to flats, add deep water check
 	// killough 3/16/98: add floorlightlevel
 	// killough 10/98: add support for skies transferred from sidedefs
-	floorplane = P_FloorHeight(camera) < viewz || // killough 3/7/98
+	floorplane = P_FloorHeight(viewx, viewy, frontsector) < viewz || // killough 3/7/98
 		(frontsector->heightsec &&
 		!(frontsector->heightsec->MoreFlags & SECF_IGNOREHEIGHTSEC) &&
 		frontsector->heightsec->ceilingpic == skyflatnum) ?

common/r_data.cpp

@@ -45,6 +45,8 @@
 
 #include <ctype.h>
 
+#include <cmath>
+
 #include <algorithm>
 
 //
@@ -478,7 +480,7 @@ tallpost_t* R_GetTextureColumn(int texnum, int colnum)
 	if (mask + 1 == width)
 		colnum &= mask;
 	else
-		colnum %= width;
+		colnum -= width * std::floor((float)colnum / (float)width);
 	int lump = texturecolumnlump[texnum][colnum];
 	int ofs = texturecolumnofs[texnum][colnum];