Merge remote-tracking branch 'remotes/upstream/master' into master

# Conflicts: # CMakeLists.txt # src/common/engine/d_event.cpp # src/menu/loadsavemenu.cpp # wadsrc/static/zscript/ui/menu/loadsavemenu.zs # wadsrc/static/zscript/ui/menu/optionmenu.zs
drfrag666 · Oct 18, 2020 · 7852049 · 7852049
2 parents 4ab103a + 0b25881
commit 7852049
Show file tree

Hide file tree

Showing 92 changed files with 3,618 additions and 2,598 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -40,14 +40,6 @@ jobs:
             os: macos-latest,
             build_type: "Debug"
           }
-        - {
-            name: "Linux GCC 5",
-            os: ubuntu-latest,
-            extra_options: "-DCMAKE_C_COMPILER=/usr/bin/gcc-5 -DCMAKE_CXX_COMPILER=/usr/bin/g++-5 \
-                            -DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF",
-            deps_cmdline: "sudo apt update && sudo apt install g++-5 libsdl2-dev libopenal-dev libfluidsynth-dev libmpg123-dev libsndfile1-dev",
-            build_type: "MinSizeRel"
-          }
         - {
             name: "Linux GCC 7",
             os: ubuntu-latest,

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,11 @@
-cmake_minimum_required( VERSION 2.8.7 )
+cmake_minimum_required( VERSION 3.1.0 )
 project(LZDoom)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF) 
+
+
 if( COMMAND cmake_policy )
 	if( POLICY CMP0011 )
 		cmake_policy( SET CMP0011 NEW )
@@ -127,13 +132,13 @@ else()
 endif()
 
 # Replacement variables for a possible long list of C/C++ compilers compatible with GCC
-if( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" )
+if( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang" )
 	set( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE TRUE )
 else()
 	set( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE FALSE )
 endif()
 
-if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
+if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
 	set( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE TRUE )
 else()
 	set( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE FALSE )
@@ -281,12 +286,7 @@ else()
 
 	if( APPLE )
 		set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
-		if( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
-			# With standard Apple tools -stdlib=libc++ needs to be specified in order to get
-			# C++11 support using SDKs 10.7 and 10.8.
-			set( CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}" )
-			set( CMAKE_EXE_LINKER_FLAGS "-stdlib=libc++ ${CMAKE_EXE_LINKER_FLAGS}" )
-		elseif( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
+		if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
 			# If we're compiling with a custom GCC on the Mac (which we know since g++-4.2 doesn't support C++11) statically link libgcc.
 			set( ALL_C_FLAGS "-static-libgcc" )
 		endif()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -314,7 +314,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
 		set( CMAKE_C_FLAGS "-Wno-unused-result ${CMAKE_C_FLAGS}" )
 		set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" )
 	endif()
-	if( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
+	if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
 		if( APPLE OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.6" )
 			set( CMAKE_CXX_FLAGS "-Wno-inconsistent-missing-override ${CMAKE_CXX_FLAGS}" )
 		endif()
@@ -1115,6 +1115,8 @@ set (PCH_SOURCES
 	common/console/c_consolebuffer.cpp
 	common/console/c_cvars.cpp
 	common/console/c_dispatch.cpp
+	common/console/c_commandbuffer.cpp
+	common/console/c_tabcomplete.cpp
 	common/console/c_expr.cpp
 	common/utility/engineerrors.cpp
 	common/utility/i_module.cpp
@@ -1171,6 +1173,7 @@ set (PCH_SOURCES
 	common/menu/optionmenu.cpp
 	common/menu/resolutionmenu.cpp
 	common/menu/menudef.cpp
+	common/menu/savegamemanager.cpp
 
 	common/rendering/v_framebuffer.cpp
 	common/rendering/v_video.cpp

diff --git a/src/bbannouncer.cpp b/src/bbannouncer.cpp
@@ -82,52 +82,52 @@ static const char *BeginSounds[] =
 
 static const SoundAndString WorldKillSounds[] =
 {
-	{ "BBA_EXCREMENT",	"VO7.SFX" },		// Excrement
-	{ "BBA_HAMBURGER",	"VO8.SFX" },		// Hamburger
-	{ "BBA_SCROTUM",	"VO9.SFX" },		// Scrotum separation
+	{ "TXT_SELFOBIT1",	"VO7.SFX" },		// Excrement
+	{ "TXT_SELFOBIT2",	"VO8.SFX" },		// Hamburger
+	{ "TXT_SELFOBIT3",	"VO9.SFX" },		// Scrotum separation
 };
 
 static const SoundAndString SuicideSounds[] =
 {
-	{ "BBA_SUICIDE",	"VO13.SFX" },		// Unassisted death
-	{ "BBA_SUICIDE",	"VO5.SFX" },		// Kevorkian approves
-	{ "BBA_POPULATION",	"VO12.SFX" },		// Population control
-	{ "BBA_DARWIN",		"VO16.SFX" }		// Darwin award
+	{ "TXT_SELFOBIT5",	"VO13.SFX" },		// Unassisted death
+	{ "TXT_SELFOBIT5",	"VO5.SFX" },		// Kevorkian approves
+	{ "TXT_SELFOBIT4",	"VO12.SFX" },		// Population control
+	{ "TXT_SELFOBIT6",	"VO16.SFX" }		// Darwin award
 };
 
 static const SoundAndString KillSounds[] =
 {
-	{ "BBA_BONED",		"BONED.SFX" },		// Boned
-	{ "BBA_CREAMED",	"CREAMED.SFX" },	// Creamed
-	{ "BBA_DECIMAT",	"DECIMAT.SFX" },	// Decimated
-	{ "BBA_DESTRO",		"DESTRO.SFX" },		// Destroyed
-	{ "BBA_DICED",		"DICED.SFX" },		// Diced
-	{ "BBA_DISEMBO",	"DISEMBO.SFX" },	// Disembowled
-	{ "BBA_FLATTE",		"FLATTE.SFX" },		// Flattened
-	{ "BBA_JUSTICE",	"JUSTICE.SFX" },	// Justice
-	{ "BBA_MADNESS",	"MADNESS.SFX" },	// Madness
-	{ "BBA_KILLED",		"KILLED.SFX" },		// Killed
-	{ "BBA_MINCMEAT",	"MINCMEAT.SFX" },	// Mincemeat
-	{ "BBA_MASSACR",	"MASSACR.SFX" },	// Massacred
-	{ "BBA_MUTILA",		"MUTILA.SFX" },		// Mutilated
-	{ "BBA_REAMED",		"REAMED.SFX" },		// Reamed
-	{ "BBA_RIPPED",		"RIPPED.SFX" },		// Ripped
-	{ "BBA_SLAUGHT",	"SLAUGHT.SFX" },	// Slaughtered
-	{ "BBA_SMASHED",	"SMASHED.SFX" },	// Smashed
-	{ "BBA_SODOMIZ",	"SODOMIZ.SFX" },	// Sodomized
-	{ "BBA_SPLATT",		"SPLATT.SFX" },		// Splattered
-	{ "BBA_SQUASH",		"SQUASH.SFX" },		// Squashed
-	{ "BBA_THROTTL",	"THROTTL.SFX" },	// Throttled
-	{ "BBA_WASTED",		"WASTED.SFX" },		// Wasted
-	{ "BBA_BODYBAG",	"VO10.SFX" },		// Body bagged
-	{ "BBA_HOSED",		"VO25.SFX" },		// Hosed
-	{ "BBA_TOAST",		"VO27.SFX" },		// Toasted
-	{ "BBA_HELL",		"VO28.SFX" },		// Sent to hell
-	{ "BBA_SPRAYED",	"VO35.SFX" },		// Sprayed
-	{ "BBA_DOGMEAT",	"VO36.SFX" },		// Dog meat
-	{ "BBA_BEATEN",		"VO39.SFX" },		// Beaten like a cur
-	{ "BBA_SNUFF",		"VO41.SFX" },		// Snuffed
-	{ "BBA_CASTRA",		"CASTRA.SFX" },		// Castrated
+	{ "TXT_OBITUARY1",	"BONED.SFX" },		// Boned
+	{ "TXT_OBITUARY3",	"CREAMED.SFX" },	// Creamed
+	{ "TXT_OBITUARY4",	"DECIMAT.SFX" },	// Decimated
+	{ "TXT_OBITUARY5",	"DESTRO.SFX" },		// Destroyed
+	{ "TXT_OBITUARY6",	"DICED.SFX" },		// Diced
+	{ "TXT_OBITUARY7",	"DISEMBO.SFX" },	// Disembowled
+	{ "TXT_OBITUARY8",	"FLATTE.SFX" },		// Flattened
+	{ "TXT_OBITUARY9",	"JUSTICE.SFX" },	// Justice
+	{ "TXT_OBITUARY10",	"MADNESS.SFX" },	// Madness
+	{ "TXT_OBITUARY11",	"KILLED.SFX" },		// Killed
+	{ "TXT_OBITUARY12",	"MINCMEAT.SFX" },	// Mincemeat
+	{ "TXT_OBITUARY13",	"MASSACR.SFX" },	// Massacred
+	{ "TXT_OBITUARY14",	"MUTILA.SFX" },		// Mutilated
+	{ "TXT_OBITUARY15",	"REAMED.SFX" },		// Reamed
+	{ "TXT_OBITUARY16",	"RIPPED.SFX" },		// Ripped
+	{ "TXT_OBITUARY17",	"SLAUGHT.SFX" },	// Slaughtered
+	{ "TXT_OBITUARY18",	"SMASHED.SFX" },	// Smashed
+	{ "TXT_OBITUARY19",	"SODOMIZ.SFX" },	// Sodomized
+	{ "TXT_OBITUARY20",	"SPLATT.SFX" },		// Splattered
+	{ "TXT_OBITUARY21",	"SQUASH.SFX" },		// Squashed
+	{ "TXT_OBITUARY22",	"THROTTL.SFX" },	// Throttled
+	{ "TXT_OBITUARY23",	"WASTED.SFX" },		// Wasted
+	{ "TXT_OBITUARY24",	"VO10.SFX" },		// Body bagged
+	{ "TXT_OBITUARY28",	"VO25.SFX" },		// Hosed
+	{ "TXT_OBITUARY26",	"VO27.SFX" },		// Toasted
+	{ "TXT_OBITUARY25",	"VO28.SFX" },		// Sent to hell
+	{ "TXT_OBITUARY29",	"VO35.SFX" },		// Sprayed
+	{ "TXT_OBITUARY30",	"VO36.SFX" },		// Dog meat
+	{ "TXT_OBITUARY31",	"VO39.SFX" },		// Beaten like a cur
+	{ "TXT_OBITUARY27",	"VO41.SFX" },		// Snuffed
+	{ "TXT_OBITUARY2",	"CASTRA.SFX" },		// Castrated
 };
 
 static const char *GoodJobSounds[] =