Merge branch 'stable' into bugfix/static-init-fix

Author: bcahue

client/src/cl_level.cpp

@@ -545,10 +545,19 @@ void G_DoLoadLevel (int position)
 	// [ML] 5/11/06 - remove sky2 remenants
 	// [SL] 2012-03-19 - Add sky2 back
 	sky1texture = R_TextureNumForName (level.skypic.c_str());
+	sky1scrolldelta = level.sky1ScrollDelta;
+	sky1columnoffset = 0;
+	sky2columnoffset = 0;
 	if (!level.skypic2.empty())
-		sky2texture = R_TextureNumForName (level.skypic2.c_str());
+	{
+		sky2texture = R_TextureNumForName(level.skypic2.c_str());
+		sky2scrolldelta = level.sky2ScrollDelta;
+	}
 	else
+	{
 		sky2texture = 0;
+		sky2scrolldelta = 0;
+	}
 
 	// [RH] Set up details about sky rendering
 	R_InitSkyMap ();

client/src/m_menu.cpp

@@ -1504,14 +1504,14 @@ static void M_PlayerSetupDrawer()
 		R_BuildPlayerTranslation(0, player_color);
 		V_ColorMap = translationref_t(translationtables, 0);
 
+		// Draw box surrounding fire and player:
+		screen->DrawPatchClean(W_CachePatch("M_PBOX"), 320 - 88 - 32 + 36,
+			PSetupDef.y + LINEHEIGHT * 3 + 22);
+
 		screen->DrawTranslatedPatchClean (W_CachePatch (sprframe->lump[0]),
 			320 - 52 - 32, PSetupDef.y + LINEHEIGHT*3 + 46);
 	}
 
-	// Draw box surrounding fire and player:
-	screen->DrawPatchClean (W_CachePatch ("M_PBOX"),
-		320 - 88 - 32 + 36, PSetupDef.y + LINEHEIGHT*3 + 22);
-
 	// Draw team setting
 	{
 		const team_t team = D_TeamByName(cl_team.cstring());

client/src/r_sky.cpp

@@ -56,8 +56,8 @@ fixed_t		skyheight;
 fixed_t		skyiscale;
 
 int			sky1shift,		sky2shift;
-fixed_t		sky1pos=0,		sky1speed=0;
-fixed_t		sky2pos=0,		sky2speed=0;
+fixed_t		sky1scrolldelta,	sky2scrolldelta;
+fixed_t		sky1columnoffset,	sky2columnoffset;
 
 // The xtoviewangleangle[] table maps a screen pixel
 // to the lowest viewangle that maps back to x ranges
@@ -73,6 +73,7 @@ char SKYFLATNAME[8] = "F_SKY1";
 
 
 static tallpost_t* skyposts[MAXWIDTH];
+static byte compositeskybuffer[MAXWIDTH][512]; // holds doublesky composite sky to blit to the screen
 
 
 //
@@ -198,33 +199,58 @@ inline void SkyColumnBlaster()
 	R_BlastSkyColumn(colfunc);
 }
 
+inline bool R_PostDataIsTransparent(byte* data)
+{
+	if (*data == '\0')
+	{
+		return true;
+	}
+	return false;
+}
+
+
+
 //
 // R_RenderSkyRange
 //
 // [RH] Can handle parallax skies. Note that the front sky is *not* masked in
 // in the normal convention for patches, but uses color 0 as a transparent
 // color.
 // [ML] 5/11/06 - Removed sky2
+// [BC] 7/5/24 - Brought back for real this time
 //
 void R_RenderSkyRange(visplane_t* pl)
 {
 	if (pl->minx > pl->maxx)
 		return;
 
 	int columnmethod = 2;
-	int skytex;
+	int frontskytex, backskytex;
 	fixed_t front_offset = 0;
+	fixed_t back_offset = 0;
 	angle_t skyflip = 0;
 
-	if (pl->picnum == skyflatnum)
+	if (pl->picnum == skyflatnum )
 	{
 		// use sky1
-		skytex = sky1texture;
+		frontskytex = texturetranslation[sky1texture];
+		if (level.flags & LEVEL_DOUBLESKY)
+		{
+			backskytex = texturetranslation[sky2texture];
+		}
+		else
+		{
+			backskytex = -1;
+		}
+		front_offset = sky1columnoffset;
+		back_offset = sky2columnoffset;
 	}
 	else if (pl->picnum == int(PL_SKYFLAT))
 	{
 		// use sky2
-		skytex = sky2texture;
+		frontskytex = texturetranslation[sky2texture];
+		backskytex = -1;
+		front_offset = sky2columnoffset;
 	}
 	else
 	{
@@ -236,7 +262,8 @@ void R_RenderSkyRange(visplane_t* pl)
 		const side_t* side = *line->sidenum + sides;
 
 		// Texture comes from upper texture of reference sidedef
-		skytex = texturetranslation[side->toptexture];
+		frontskytex = texturetranslation[side->toptexture];
+		backskytex = -1;
 
 		// Horizontal offset is turned into an angle offset,
 		// to allow sky rotation as well as careful positioning.
@@ -261,7 +288,8 @@ void R_RenderSkyRange(visplane_t* pl)
 
 	dcol.iscale = skyiscale >> skystretch;
 	dcol.texturemid = skytexturemid;
-	dcol.textureheight = textureheight[skytex];
+	dcol.textureheight = textureheight[frontskytex]; // both skies are forced to be the same height anyway
+	dcol.texturefrac = dcol.texturemid + (dcol.yl - centery) * dcol.iscale;
 	skyplane = pl;
 
 	// set up the appropriate colormap for the sky
@@ -284,13 +312,97 @@ void R_RenderSkyRange(visplane_t* pl)
 	// column in this range.
 	for (int x = pl->minx; x <= pl->maxx; x++)
 	{
-		int colnum = ((((viewangle + xtoviewangle[x]) ^ skyflip) >> sky1shift) + front_offset) >> FRACBITS;
-		skyposts[x] = R_GetTextureColumn(skytex, colnum);
+		int sky1colnum = ((((viewangle + xtoviewangle[x]) ^ skyflip) >> sky1shift) + front_offset) >> FRACBITS;
+		tallpost_t* skypost = R_GetTextureColumn(frontskytex, sky1colnum);
+		if (backskytex == -1)
+		{
+			skyposts[x] = skypost;
+		}
+		else
+		{
+			// create composite of both skies
+			int sky2colnum = ((((viewangle + xtoviewangle[x]) ^ skyflip) >> sky2shift) + back_offset) >> FRACBITS;
+			tallpost_t* skypost2 = R_GetTextureColumn(backskytex, sky2colnum);
+
+			int count = MIN<int> (512, MIN (textureheight[backskytex], textureheight[frontskytex]) >> FRACBITS);
+			int destpostlen = 0;
+
+			BYTE* composite = compositeskybuffer[x];
+			tallpost_t* destpost = (tallpost_t*)composite;
+
+			tallpost_t* orig = destpost; // need a pointer to the og element to return!
+			
+			// here's the skinny...
+
+			// we need to grab sky1 as long as it has a valid topdelta and length
+			// in a lot of cases there's gaps in length and topdelta because of transparency
+			// its up to us to find these gaps and put in sky2 when needed
+
+			// but when we grab from sky1, we ALSO have to check every byte if it's index 0.
+			// if it is, we need to grab the same byte from sky2 instead.
+			// this allows non-converted sky patches, like those in hexen.wad or tlsxctf1.wad
+			// to work
+
+			// the finished tallpost should be the same length as count, and 0 topdelta, with a endpost after.
+			
+			destpost->topdelta = 0;
+
+			while (destpostlen < count)
+			{
+				int remaining = count - destpostlen; // pixels remaining to be replenished
+
+				if (skypost->topdelta == destpostlen)
+				{
+					// valid first sky, grab its data and advance the pixel
+					memcpy(destpost->data() + destpostlen, skypost->data(), skypost->length);
+					// before advancing, check the data we just inserted, and input sky2 if its index 0
+					for (int i = 0; i < skypost->length; i++)
+					{
+						if (R_PostDataIsTransparent(destpost->data() + destpostlen + i))
+						{
+							// use sky2 for this pixel
+						
+							memcpy(destpost->data() + destpostlen + i,
+							       skypost2->data() + destpostlen + i, 1);
+						}
+					}
+					destpostlen += skypost->length;
+				}
+				else
+				{
+					// sky1 top delta is less than current pixel, lets get sky2 up to the pixel
+					int cursky1delta = abs((skypost->end() ? remaining : skypost->topdelta) - destpostlen);
+					int sky2len = cursky1delta > remaining ? remaining : cursky1delta;
+					memcpy(destpost->data() + destpostlen, skypost2->data() + destpostlen,
+					       sky2len);
+					destpostlen += sky2len;
+				}
+
+				if (!skypost->next()->end() && destpostlen >= skypost->topdelta + skypost->length)
+				{
+					skypost = skypost->next();
+				}
+
+				if (!skypost2->next()->end() && destpostlen >= skypost2->topdelta + skypost2->length)
+				{
+					skypost2 = skypost2->next();
+				}
+
+				destpost->length = destpostlen;
+			}
+
+			// finish the post up.
+			destpost = destpost->next();
+			destpost->length = 0;
+			destpost->writeend();
+
+			skyposts[x] = orig;
+		}
 	}
 
 	R_RenderColumnRange(pl->minx, pl->maxx, (int*)pl->top, (int*)pl->bottom,
 			skyposts, SkyColumnBlaster, false, columnmethod);
-				
+
 	R_ResetDrawFuncs();
 }
 

common/d_main.cpp

@@ -174,6 +174,12 @@ static const char* steam_install_subdirs[] =
 	"steamapps\\common\\ultimate doom\\base",
 	"steamapps\\common\\DOOM 3 BFG Edition\\base\\wads",
 	"steamapps\\common\\master levels of doom\\master\\wads", //Let Odamex find the Master Levels pwads too
+	"steamapps\\common\\ultimate doom\\base\\doom2", //2024 Steam re-release additions here and below
+	"steamapps\\common\\ultimate doom\\base\\master\\wads",
+	"steamapps\\common\\ultimate doom\\base\\plutonia",
+	"steamapps\\common\\ultimate doom\\base\\tnt",
+	"steamapps\\common\\ultimate doom\\rerelease",
+	
 };
 
 

common/g_level.cpp

@@ -885,6 +885,8 @@ void G_InitLevelLocals()
 	{
 		::level.skypic2 =::level.skypic.c_str();
 	}
+	::level.sky1ScrollDelta = info.sky1ScrollDelta;
+	::level.sky2ScrollDelta = info.sky2ScrollDelta;
 
 	if (::level.flags & LEVEL_JUMP_YES)
 	{

common/g_level.h

@@ -173,6 +173,9 @@ struct level_pwad_info_t
 	std::string		intertextsecret;
 	OLumpName		interbackdrop;
 	OLumpName		intermusic;
+
+	fixed_t			sky1ScrollDelta;
+	fixed_t			sky2ScrollDelta;
 
 	std::vector<bossaction_t> bossactions;
 
@@ -185,7 +188,8 @@ struct level_pwad_info_t
 	      partime(0), skypic(""), music(""), flags(0), cluster(0), snapshot(NULL),
 	      defered(NULL), fadetable("COLORMAP"), skypic2(""), gravity(0.0f),
 	      aircontrol(0.0f), exitpic(""), enterpic(""), endpic(""), intertext(""),
-	      intertextsecret(""), interbackdrop(""), intermusic(""), bossactions(), label(),
+	      intertextsecret(""), interbackdrop(""), intermusic(""), 
+	      sky1ScrollDelta(0), sky2ScrollDelta(0), bossactions(), label(),
 	      clearlabel(false), author()
 	{
 		ArrayInit(fadeto_color, 0);
@@ -197,12 +201,12 @@ struct level_pwad_info_t
 	level_pwad_info_t(const level_info_t& other)
 	    : mapname(other.mapname), levelnum(other.levelnum), level_name(other.level_name),
 	      pname(other.pname), nextmap(other.nextmap),
-		  secretmap(other.secretmap), partime(other.partime), skypic(other.skypic),
-		  music(other.music), flags(other.flags), cluster(other.cluster),
-		  snapshot(other.snapshot), defered(other.defered), fadetable("COLORMAP"),
-		  skypic2(""), gravity(0.0f), aircontrol(0.0f), exitpic(""), enterpic(""),
-		  endpic(""), intertext(""), intertextsecret(""), interbackdrop(""), intermusic(""),
-		  bossactions(), label(), clearlabel(false), author()
+	      secretmap(other.secretmap), partime(other.partime), skypic(other.skypic),
+	      music(other.music), flags(other.flags), cluster(other.cluster),
+	      snapshot(other.snapshot), defered(other.defered), fadetable("COLORMAP"),
+	      skypic2(""), gravity(0.0f), aircontrol(0.0f), exitpic(""), enterpic(""),
+	      endpic(""), intertext(""), intertextsecret(""), interbackdrop(""), intermusic(""),
+	      bossactions(), label(), clearlabel(false), author(), sky1ScrollDelta(0), sky2ScrollDelta(0)
 	{
 		ArrayInit(fadeto_color, 0);
 		ArrayInit(outsidefog_color, 0);
@@ -242,6 +246,8 @@ struct level_pwad_info_t
 		intertextsecret = other.intertextsecret;
 		interbackdrop = other.interbackdrop;
 		intermusic = other.intermusic;
+		sky1ScrollDelta = other.sky1ScrollDelta;
+		sky2ScrollDelta = other.sky2ScrollDelta;
 		bossactions.clear();
 		std::copy(other.bossactions.begin(), other.bossactions.end(),
 		          bossactions.begin());
@@ -290,6 +296,9 @@ struct level_locals_t
 	OLumpName		skypic;
 	OLumpName		skypic2;
 
+	fixed_t			sky1ScrollDelta;
+	fixed_t			sky2ScrollDelta;
+
 	int				total_secrets;
 	int				found_secrets;
 

common/g_mapinfo.cpp

@@ -565,7 +565,18 @@ void MIType_Sky(OScanner& os, bool newStyleMapInfo, void* data, unsigned int fla
 {
 	ParseMapInfoHelper<OLumpName>(os, newStyleMapInfo);
 
-	*static_cast<OLumpName*>(data) = os.getToken();
+	level_pwad_info_t& info = *static_cast<level_pwad_info_t*>(data);
+
+	std::string pic = os.getToken();
+
+	if (flags == 1)
+	{
+		info.skypic = pic;
+	}
+	else
+	{
+		info.skypic2 = pic;
+	}
 
 	os.scan();
 	// Scroll speed
@@ -575,14 +586,14 @@ void MIType_Sky(OScanner& os, bool newStyleMapInfo, void* data, unsigned int fla
 	}
 	if (IsRealNum(os.getToken().c_str()))
 	{
-		/*if (HexenHack)
+		if (flags == 1)
 		{
-		    *((fixed_t *)(info + handler->data2)) = sc_Number << 8;
+			info.sky1ScrollDelta = FLOAT2FIXED(os.getTokenFloat());
 		}
-		 else
+		else
 		{
-		    *((fixed_t *)(info + handler->data2)) = (fixed_t)(sc_Float * 65536.0f);
-		}*/
+			info.sky2ScrollDelta = FLOAT2FIXED(os.getTokenFloat());
+		}
 	}
 	else
 	{
@@ -1082,8 +1093,8 @@ struct MapInfoDataSetter<level_pwad_info_t>
 		ENTRY3("secretnext", &MIType_MapName, &ref.secretmap)
 		ENTRY3("secret", &MIType_MapName, &ref.secretmap)
 		ENTRY3("cluster", &MIType_Cluster, &ref.cluster)
-		ENTRY3("sky1", &MIType_Sky, &ref.skypic)
-		ENTRY3("sky2", &MIType_Sky, &ref.skypic2)
+		ENTRY4("sky1", &MIType_Sky, &ref, 1)
+		ENTRY4("sky2", &MIType_Sky, &ref, 2)
 		ENTRY3("fade", &MIType_Color, &ref.fadeto_color)
 		ENTRY3("outsidefog", &MIType_Color, &ref.outsidefog_color)
 		ENTRY3("titlepatch", &MIType_LumpName, &ref.pname)

common/p_map.cpp

@@ -411,8 +411,8 @@ BOOL PIT_CheckLine (line_t *ld)
     {
 		if ((ld->flags &
 		     (ML_BLOCKING | ML_BLOCKEVERYTHING)) || // explicitly blocking everything
-		    (!tmthing->player && (ld->flags & ML_BLOCKMONSTERS)) || // block monsters only
-		    (!tmthing->player && (ld->flags & ML_BLOCKLANDMONSTERS) &&
+		    (!tmthing->player && tmthing->type != MT_AVATAR && (ld->flags & ML_BLOCKMONSTERS)) || // block monsters only
+		    (!tmthing->player && tmthing->type != MT_AVATAR && (ld->flags & ML_BLOCKLANDMONSTERS) &&
 		     !(tmthing->flags & MF_FLOAT)) || // [Blair] Block land monsters.
 		    (tmthing->player &&
 		     (ld->flags & ML_BLOCKPLAYERS))) // [Blair] Block players only

common/p_mobj.cpp

@@ -1775,7 +1775,7 @@ void P_ZMovement(AActor *mo)
 		return;
 	}
 
-	if (mo->player)
+	if (mo->player && !P_IsVoodooDoll(mo))
 		P_PlayerSmoothStepUp(mo);
 
 	// ZDoom applies gravity earlier in the function than vanilla