Merge pull request sirjuddington#1729 from eevee/papercuts-2024

Fix some papercuts, 2024 edition

cmake/unix.cmake

@@ -156,6 +156,9 @@ if(HAVE_SSE)
 	add_definitions(-D_USE_SSE)
 endif()
 
+# Define a SLADE_DEBUG macro
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSLADE_DEBUG")
+
 # Enable debug symbols for glib (so gdb debugging works properly with strings etc.)
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG")
 

dist/res/config/archive_formats.cfg

@@ -230,7 +230,7 @@ archive_formats
 		supports_dirs = false;
 		entry_format = "archive_wolf";
 		prefer_uppercase = true;
-		
+
 		extensions
 		{
 			wl1 = "Wolf3D WL1";

dist/res/config/colours/Dark Grey.txt

@@ -151,14 +151,14 @@ colours {
 		group = "Map Editor";
 		rgb = 0, 0, 0;
 	}
-	
+
 	map_linedraw
 	{
 		name = "Line Drawing";
 		group = "Map Editor";
 		rgb = 0, 150, 50;
 	}
-	
+
 	map_3d_crosshair
 	{
 		name = "3D Crosshair";
@@ -167,15 +167,15 @@ colours {
 		alpha = 255;
 		additive = true;
 	}
-	
+
 	map_3d_hilight
 	{
 		name = "3D Hilight";
 		group = "Map Editor";
 		rgb = 0, 180, 255;
 		alpha = 180;
 	}
-	
+
 	map_3d_selection
 	{
 		name = "3D Selection";

dist/res/config/colours/Default.txt

@@ -265,14 +265,14 @@ colours {
 		group = "Map Editor";
 		rgb = 0, 0, 0;
 	}
-	
+
 	map_linedraw
 	{
 		name = "Line Drawing";
 		group = "Map Editor";
 		rgb = 0, 150, 50;
 	}
-	
+
 	map_3d_crosshair
 	{
 		name = "3D Crosshair";
@@ -281,15 +281,15 @@ colours {
 		alpha = 255;
 		additive = true;
 	}
-	
+
 	map_3d_hilight
 	{
 		name = "3D Hilight";
 		group = "Map Editor";
 		rgb = 255, 255, 140;
 		alpha = 170;
 	}
-	
+
 	map_3d_selection
 	{
 		name = "3D Selection";

dist/res/config/entry_types/map.cfg

@@ -36,7 +36,7 @@ map_linedefs : map_base
 
 // Doom64 sidedef_t is 12-byte long; "normal" sidedefs are 30-byte long.
 // The reduced size in D64 is because the textures are referenced by a
-// two-byte index rather than by their eight-byte name. 
+// two-byte index rather than by their eight-byte name.
 map_sidedefs : map_base
 {
 	name = "Map Sides";

dist/res/config/games/chex1.cfg

@@ -5,19 +5,19 @@
 game chex1
 {
 	name = "Chex Quest";
-	
+
 	// IWAD filename
 	iwad = "chex.wad";
-	
+
 	// Supported map formats
 	map_formats = doom;
-	
+
 	// DECORATE filters
 	filters = "chex", "any";
 
 	// Sky flat for 3d mode
 	sky_flat = "F_SKY1";
-	
+
 	// Light levels
 	light_level_interval = 16;
 
@@ -43,14 +43,14 @@ game chex1
 			heightceiling	= 128;
 			lightlevel		= 160;
 		}
-		
+
 		block sidedef
 		{
 			texturetop		= "CEMENT2";
 			texturemiddle	= "CEMENT2";
 			texturebottom	= "CEMENT2";
 		}
-		
+
 		block thing
 		{
 			type	= 1;

dist/res/config/games/chex3.cfg

@@ -5,28 +5,28 @@
 game chex3
 {
 	name = "Chex Quest 3";
-	
+
 	// IWAD filename
 	iwad = "chex3.wad";
-	
+
 	// Supported map formats
 	map_formats = hexen, udmf;
-	
+
 	// DECORATE filters
 	filters = "chex", "any";
 
 	// Enable mixed textures and flats
 	mix_tex_flats = true;
-	
+
 	// Enable TX_ namespace
 	tx_textures = true;
-	
+
 	// Scripting
 	script_language = "acs_zdoom";
 
 	// Sky flat for 3d mode
 	sky_flat = "F_SKY1";
-	
+
 	// Light levels
 	light_level_interval = 8;
 
@@ -66,14 +66,14 @@ game chex3
 			heightceiling	= 128;
 			lightlevel		= 160;
 		}
-		
+
 		block sidedef
 		{
 			texturetop		= "CEMENT2";
 			texturemiddle	= "CEMENT2";
 			texturebottom	= "CEMENT2";
 		}
-		
+
 		block thing
 		{
 			type	= 1;

dist/res/config/games/doom1.cfg

@@ -5,19 +5,19 @@
 game doom
 {
 	name = "Doom (Ultimate)";
-	
+
 	// IWAD filename
 	iwad = "doom.wad";
-	
+
 	// Supported map formats
 	map_formats = doom;
-	
+
 	// DECORATE filters
 	filters = "doom", "any";
 
 	// Sky flat for 3d mode
 	sky_flat = "F_SKY1";
-	
+
 	// Light levels
 	light_level_interval = 16;
 
@@ -56,7 +56,7 @@ game doom
 		map E3M7 { sky = "SKY3"; }
 		map E3M8 { sky = "SKY3"; }
 		map E3M9 { sky = "SKY3"; }
-		
+
 		// Episode 4
 		map E4M1 { sky = "SKY4"; }
 		map E4M2 { sky = "SKY4"; }
@@ -80,14 +80,14 @@ game doom
 			heightceiling	= 128;
 			lightlevel		= 160;
 		}
-		
+
 		block sidedef
 		{
 			texturetop		= "STONE2";
 			texturemiddle	= "STONE2";
 			texturebottom	= "STONE2";
 		}
-		
+
 		block thing
 		{
 			type	= 1;

dist/res/config/games/doom2.cfg

@@ -5,19 +5,19 @@
 game doom2
 {
 	name = "Doom 2";
-	
+
 	// IWAD filename
 	iwad = "doom2.wad";
-	
+
 	// Supported map formats
 	map_formats = doom;
-	
+
 	// DECORATE filters
 	filters = "doom", "any";
 
 	// Sky flat for 3d mode
 	sky_flat = "F_SKY1";
-	
+
 	// Light levels
 	light_level_interval = 16;
 
@@ -74,14 +74,14 @@ game doom2
 			heightceiling	= 128;
 			lightlevel		= 160;
 		}
-		
+
 		block sidedef
 		{
 			texturetop		= "STONE2";
 			texturemiddle	= "STONE2";
 			texturebottom	= "STONE2";
 		}
-		
+
 		block thing
 		{
 			type	= 1;

dist/res/config/games/doom64.cfg

@@ -4,25 +4,25 @@
 game doom64
 {
 	name = "Doom 64";
-	
+
 	// IWAD filename
 	iwad = "doom64.wad";
-	
+
 	// Supported map formats
 	map_formats = doom64;
-	
+
 	// DECORATE filters
 	filters = "doom64", "any";
-	
+
 	// Sky flat?
-	
+
 	// Valid map names -- Doom64 EX supports MAPINFO so actually
 	// any map name is a valid name.
 	map_name_any = true;
 
 	// Enable mixed textures and flats
 	mix_tex_flats = true;
-	
+
 	// Enable TX_ namespace (actually T_ namespace)
 	tx_textures = true;
 
@@ -89,7 +89,7 @@ game doom64
 			heightceiling	= 128;
 			lightlevel		= 256;
 		}
-		
+
 		block sidedef
 		{
 			texturetop		= "C29";

dist/res/config/games/heretic.cfg

@@ -4,19 +4,19 @@
 game heretic
 {
 	name = "Heretic";
-	
+
 	// IWAD filename
 	iwad = "heretic.wad";
-	
+
 	// Supported map formats
 	map_formats = doom;
-	
+
 	// DECORATE filters
 	filters = "heretic", "raven", "any";
 
 	// Sky flat for 3d mode
 	sky_flat = "F_SKY1";
-	
+
 	// Light levels
 	light_level_interval = 16;
 
@@ -95,14 +95,14 @@ game heretic
 			heightceiling	= 128;
 			lightlevel		= 160;
 		}
-		
+
 		block sidedef
 		{
 			texturetop		= "GRSTNPB";
 			texturemiddle	= "GRSTNPB";
 			texturebottom	= "GRSTNPB";
 		}
-		
+
 		block thing
 		{
 			type	= 1;