Merge remote-tracking branch 'public/master'

ZDoom · Aug 29, 2021 · 65d4919 · 65d4919
2 parents c1937e4 + a2f17b1
commit 65d4919
Show file tree

Hide file tree

Showing 48 changed files with 2,212 additions and 2,122 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -24,13 +24,13 @@ jobs:
           }
         - {
             name: "macOS",
-            os: macos-10.15,
+            os: macos-11,
             deps_cmdline: "brew install libvpx",
             build_type: "Release"
           }
         - {
             name: "macOS",
-            os: macos-10.15,
+            os: macos-11,
             extra_options: "-DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF",
             deps_cmdline: "brew install libvpx fluidsynth mpg123 libsndfile",
             build_type: "Debug"
@@ -54,14 +54,14 @@ jobs:
             os: ubuntu-20.04,
             extra_options: "-DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 \
                             -DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF",
-            deps_cmdline: "sudo apt update && sudo apt remove gcc-11 libgcc-11-dev g++-11 libstdc++-11-dev && sudo apt install clang-6.0 libstdc++-9-dev libsdl2-dev libvpx-dev libopenal-dev libfluidsynth-dev libmpg123-dev libsndfile1-dev",
+            deps_cmdline: "sudo apt update && sudo apt install clang-6.0 libsdl2-dev libvpx-dev libopenal-dev libfluidsynth-dev libmpg123-dev libsndfile1-dev",
             build_type: "Debug"
           }
         - {
-            name: "Linux Clang 11",
+            name: "Linux Clang 12",
             os: ubuntu-20.04,
-            extra_options: "-DCMAKE_C_COMPILER=clang-11 -DCMAKE_CXX_COMPILER=clang++-11",
-            deps_cmdline: "sudo apt update && sudo apt install clang-11 libsdl2-dev libvpx-dev",
+            extra_options: "-DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12",
+            deps_cmdline: "sudo apt update && sudo apt install clang-12 libsdl2-dev libvpx-dev",
             build_type: "Release"
           }
 

diff --git a/source/common/utility/tarray.h b/source/common/utility/tarray.h
@@ -837,6 +837,18 @@ class TMap
 		CopyNodes(o.Nodes, o.Size);
 	}
 
+	TMap(TMap &&o)
+	{
+		Nodes = o.Nodes;
+		LastFree = o.LastFree;		/* any free position is before this position */
+		Size = o.Size;		/* must be a power of 2 */
+		NumUsed = o.NumUsed;
+
+		o.Size = 0;
+		o.NumUsed = 0;
+		o.SetNodeVector(1);
+	}
+
 	TMap &operator= (const TMap &o)
 	{
 		NumUsed = 0;
@@ -846,6 +858,12 @@ class TMap
 		return *this;
 	}
 
+	TMap &operator= (TMap &&o)
+	{
+		TransferFrom(o);
+		return *this;
+	}
+
 	//=======================================================================
 	//
 	// TransferFrom

diff --git a/source/core/defparser.cpp b/source/core/defparser.cpp
@@ -2026,7 +2026,7 @@ static bool parseDefineQAVInterpolateIgnoreBlock(FScanner& sc, const int& res_id
 
 	if (sc.StartBraces(&blockend))
 	{
-		pos.Message(MSG_ERROR, "defineqav (%d): interpolate: malformed syntax, unable to continue", res_id);
+		pos.Message(MSG_ERROR, "defineqav (%d): interpolate: ignore: malformed syntax, unable to continue", res_id);
 		return false;
 	}
 	while (!sc.FoundEndBrace(blockend))
@@ -2039,7 +2039,7 @@ static bool parseDefineQAVInterpolateIgnoreBlock(FScanner& sc, const int& res_id
 	// Confirm we received something for 'frames' and 'tiles'.
 	if (scframes.IsEmpty() || sctiles.IsEmpty())
 	{
-		pos.Message(MSG_ERROR, "defineqav (%d): interpolate: unable to get any values for 'frames' or 'tiles', unable to continue", res_id);
+		pos.Message(MSG_ERROR, "defineqav (%d): interpolate: ignore: unable to get any values for 'frames' or 'tiles', unable to continue", res_id);
 		return false;
 	}
 
@@ -2102,7 +2102,7 @@ static bool parseDefineQAVInterpolateBlock(FScanner& sc, const int& res_id, cons
 
 	if (sc.StartBraces(&blockend))
 	{
-		pos.Message(MSG_ERROR, "defineqav (%d): interpolate (%s): malformed syntax, unable to continue", res_id, interptype.GetChars());
+		pos.Message(MSG_ERROR, "defineqav (%d): interpolate: malformed syntax, unable to continue", res_id);
 		return false;
 	}
 	while (!sc.FoundEndBrace(blockend))
@@ -2112,13 +2112,13 @@ static bool parseDefineQAVInterpolateBlock(FScanner& sc, const int& res_id, cons
 		{
 			if (interptype.IsNotEmpty())
 			{
-				pos.Message(MSG_ERROR, "defineqav (%d): interpolate (%s): more than one interpolation type defined, unable to continue", res_id, interptype.GetChars());
+				pos.Message(MSG_ERROR, "defineqav (%d): interpolate: more than one interpolation type defined, unable to continue", res_id);
 				return false;
 			}
 			sc.GetString(interptype);
 			if (!gi->IsQAVInterpTypeValid(interptype))
 			{
-				pos.Message(MSG_ERROR, "defineqav (%d): interpolate (%s): interpolation type not found", res_id, interptype.GetChars());
+				pos.Message(MSG_ERROR, "defineqav (%d): interpolate: interpolation type not found", res_id);
 				return false;
 			}
 		}

diff --git a/source/core/gamecvars.cpp b/source/core/gamecvars.cpp
@@ -87,8 +87,10 @@ CVARD(Bool, cl_bloodvanillabobbing, true, CVAR_ARCHIVE, "enable/disable Blood's
 CVARD(Bool, cl_bloodvanillaexplosions, false, CVAR_ARCHIVE, "enable/disable Blood's vanilla explosion behavior")
 CVARD(Bool, cl_bloodvanillaenemies, false, CVAR_ARCHIVE, "enable/disable Blood's vanilla enemy behavior")
 CVARD(Bool, cl_bloodqavinterp, true, CVAR_ARCHIVE, "enable/disable Blood's QAV interpolation")
+CVARD(Bool, cl_bloodqavforcedinterp, false, CVAR_ARCHIVE, "enable/disable Blood's QAV interpolation forcefully for QAVs that aren't defined as interpolatable")
 CVARD(Bool, cl_bloodweapinterp, false, CVAR_ARCHIVE, "enable/disable Blood's weapon interpolation. Depends on 'cl_bloodqavinterp'")
 CVARD(Bool, cl_bloodoldweapbalance, false, CVAR_ARCHIVE, "enable/disable legacy 1.0 weapon handling for Blood")
+CVARD(Bool, cl_loadingscreens, true, CVAR_ARCHIVE, "enable/disable loading screens for games")
 
 
 CUSTOM_CVARD(Int, cl_autoaim, 1, CVAR_ARCHIVE|CVAR_USERINFO, "enable/disable weapon autoaim")

diff --git a/source/core/gamecvars.h b/source/core/gamecvars.h
@@ -32,8 +32,10 @@ EXTERN_CVAR(Bool, cl_bloodvanillabobbing)
 EXTERN_CVAR(Bool, cl_bloodvanillaexplosions)
 EXTERN_CVAR(Bool, cl_bloodvanillaenemies)
 EXTERN_CVAR(Bool, cl_bloodqavinterp)
+EXTERN_CVAR(Bool, cl_bloodqavforcedinterp)
 EXTERN_CVAR(Bool, cl_bloodweapinterp)
 EXTERN_CVAR(Bool, cl_bloodoldweapbalance)
+EXTERN_CVAR(Bool, cl_loadingscreens)
 
 EXTERN_CVAR(Bool, demorec_seeds_cvar)
 EXTERN_CVAR(Bool, demoplay_diffs)

diff --git a/source/core/screenjob.cpp b/source/core/screenjob.cpp
@@ -222,10 +222,10 @@ void ShowIntermission(MapRecord* fromMap, MapRecord* toMap, SummaryInfo* info, C
 				if  (tocluster == nullptr || !CreateCutscene(&tocluster->intro, runner, toMap, !!fromMap))
 					CreateCutscene(&globalCutscenes.DefaultMapIntro, runner, toMap, !!fromMap);
 			}
-			// Skip the load screen if the level is started from the console.
+			// Skip the load screen if the level is started from the console or loading screens are disabled.
 			// In this case the load screen is not helpful as it blocks the actual level start, 
 			// requiring closing and reopening the console first before entering any commands that need the level.
-			if (ConsoleState == c_up || ConsoleState == c_rising)
+			if ((ConsoleState == c_up || ConsoleState == c_rising) && cl_loadingscreens)
 				CreateCutscene(&globalCutscenes.LoadingScreen, runner, toMap, true);
 		}
 		else if (isShareware())

diff --git a/source/core/searchpaths.cpp b/source/core/searchpaths.cpp
@@ -840,9 +840,6 @@ TArray<GrpEntry> GrpScan()
 	sortedFileList.Delete(0, findex + 1);
 	sortedGroupList.Delete(0, gindex + 1);
 
-	if (sortedGroupList.Size() == 0 || sortedFileList.Size() == 0)
-		return foundGames;
-
 	for (auto entry : sortedFileList)
 	{
 		GetCRC(entry, cachedCRCs);