diff --git a/readme.txt b/readme.txt
index 71aa843f0fef3df703ae8e307b102dc67634fc4b..ed3c4ec51547fada2ca85c48aa10ee4b40e4a631 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-Here it is! SRB2 v2.1.6 source code!
+Here it is! SRB2 v2.1.7 source code!
Win32 with Visual C (6SP6+Processor Pack OR 7)
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index fcb4396455642339fa34dfeb6fd38855a1062d57..0db3e903494ce6fdbe3f75f8b444f2a0042f9299 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -1724,6 +1724,9 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
ffloor_t * rover;
fixed_t highcut = 0, lowcut = 0;
+ INT32 texnum;
+ line_t * newline = NULL; // Multi-Property FOF
+
highcut = gr_frontsector->ceilingheight < gr_backsector->ceilingheight ? gr_frontsector->ceilingheight : gr_backsector->ceilingheight;
lowcut = gr_frontsector->floorheight > gr_backsector->floorheight ? gr_frontsector->floorheight : gr_backsector->floorheight;
@@ -1736,6 +1739,14 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
if (*rover->topheight < lowcut || *rover->bottomheight > highcut)
continue;
+ texnum = texturetranslation[sides[rover->master->sidenum[0]].midtexture];
+
+ if (rover->master->flags & ML_TFERLINE)
+ {
+ size_t linenum = gr_curline->linedef-gr_backsector->lines[0];
+ newline = rover->master->frontsector->lines[0] + linenum;
+ texnum = texturetranslation[sides[newline->sidenum[0]].midtexture];
+ }
h = *rover->topheight;
l = *rover->bottomheight;
@@ -1757,10 +1768,19 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
}
else if (drawtextured)
{
- grTex = HWR_GetTexture(texturetranslation[sides[rover->master->sidenum[0]].midtexture]);
+ grTex = HWR_GetTexture(texnum);
+
+ if (newline)
+ {
+ wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[newline->sidenum[0]].rowoffset) * grTex->scaleY;
+ wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[newline->sidenum[0]].rowoffset)) * grTex->scaleY;
+ }
+ else
+ {
+ wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset) * grTex->scaleY;
+ wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset)) * grTex->scaleY;
+ }
- wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset) * grTex->scaleY;
- wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset)) * grTex->scaleY;
wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX;
wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX;
}
@@ -1803,11 +1823,11 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
}
if (gr_frontsector->numlights)
- HWR_SplitWall(gr_frontsector, wallVerts, texturetranslation[sides[rover->master->sidenum[0]].midtexture], &Surf, rover->flags);
+ HWR_SplitWall(gr_frontsector, wallVerts, texnum, &Surf, rover->flags);
else
{
if (blendmode != PF_Masked)
- HWR_AddTransparentWall(wallVerts, &Surf, texturetranslation[sides[rover->master->sidenum[0]].midtexture], blendmode, false, lightnum, colormap);
+ HWR_AddTransparentWall(wallVerts, &Surf, texnum, blendmode, false, lightnum, colormap);
else
HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
}
@@ -1824,6 +1844,15 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
if (*rover->topheight < lowcut || *rover->bottomheight > highcut)
continue;
+ texnum = texturetranslation[sides[rover->master->sidenum[0]].midtexture];
+
+ if (rover->master->flags & ML_TFERLINE)
+ {
+ size_t linenum = gr_curline->linedef-gr_backsector->lines[0];
+ newline = rover->master->frontsector->lines[0] + linenum;
+ texnum = texturetranslation[sides[newline->sidenum[0]].midtexture];
+ }
+
h = *rover->topheight;
l = *rover->bottomheight;
if (h > highcut)
@@ -1845,10 +1874,19 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
}
else if (drawtextured)
{
- grTex = HWR_GetTexture(texturetranslation[sides[rover->master->sidenum[0]].midtexture]);
+ grTex = HWR_GetTexture(texnum);
+
+ if (newline)
+ {
+ wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[newline->sidenum[0]].rowoffset) * grTex->scaleY;
+ wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[newline->sidenum[0]].rowoffset)) * grTex->scaleY;
+ }
+ else
+ {
+ wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset) * grTex->scaleY;
+ wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset)) * grTex->scaleY;
+ }
- wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset) * grTex->scaleY;
- wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset)) * grTex->scaleY;
wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX;
wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX;
}
@@ -1891,11 +1929,11 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
}
if (gr_backsector->numlights)
- HWR_SplitWall(gr_backsector, wallVerts, texturetranslation[sides[rover->master->sidenum[0]].midtexture], &Surf, rover->flags);
+ HWR_SplitWall(gr_backsector, wallVerts, texnum, &Surf, rover->flags);
else
{
if (blendmode != PF_Masked)
- HWR_AddTransparentWall(wallVerts, &Surf, texturetranslation[sides[rover->master->sidenum[0]].midtexture], blendmode, false, lightnum, colormap);
+ HWR_AddTransparentWall(wallVerts, &Surf, texnum, blendmode, false, lightnum, colormap);
else
HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
}
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index b968fee02091a711cb1c90321ee3f5b1ad4c6c58..0af7455ede06a87e0f55debe180a1f5eca26f723 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1144,8 +1144,9 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
spriteframe_t *sprframe;
float finalscale;
- if (tics > durs)
- durs = tics;
+ // Apparently people don't like jump frames like that, so back it goes
+ //if (tics > durs)
+ //durs = tics;
if (spr->mobj->flags2 & MF2_SHADOW)
{
diff --git a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
index 16a01ee69c109a01a754ae47e87d0ce30d0ab2e7..1704f434a81fe8267d3f8cea04a17d7523585cab 100644
--- a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
+++ b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
@@ -1214,7 +1214,7 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CURRENT_PROJECT_VERSION = 2.1.6;
+ CURRENT_PROJECT_VERSION = 2.1.7;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
NORMALSRB2,
@@ -1226,7 +1226,7 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CURRENT_PROJECT_VERSION = 2.1.6;
+ CURRENT_PROJECT_VERSION = 2.1.7;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PREPROCESSOR_DEFINITIONS = (