From c8db1f151e656ab4adfa04dd48c60a81b0174f45 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 15 Feb 2017 12:16:24 +0100
Subject: [PATCH] - fixed: All FNames inside actor classes need to be
 FNameNoInit or their constructor will overwrite them after copying the
 defaults.

---
 src/d_player.h       | 12 ++++++------
 src/p_user.cpp       |  2 --
 src/win32/i_main.cpp |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index 65f401f2d..7fa0d45b2 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -155,12 +155,12 @@ public:
 	double		ViewBob;
 
 	// Former class properties that were moved into the object to get rid of the meta class.
-	FName SoundClass;		// Sound class
-	FName Face;			// Doom status bar face (when used)
-	FName Portrait;
-	FName Slot[10];
-	FName InvulMode;
-	FName HealingRadiusType;
+	FNameNoInit SoundClass;		// Sound class
+	FNameNoInit Face;			// Doom status bar face (when used)
+	FNameNoInit Portrait;
+	FNameNoInit Slot[10];
+	FNameNoInit InvulMode;
+	FNameNoInit HealingRadiusType;
 	double HexenArmor[5];
 	BYTE ColorRangeStart;	// Skin color range
 	BYTE ColorRangeEnd;
diff --git a/src/p_user.cpp b/src/p_user.cpp
index 6e7d7c8ec..eea26cc4b 100644
--- a/src/p_user.cpp
+++ b/src/p_user.cpp
@@ -1232,8 +1232,6 @@ const char *APlayerPawn::GetSoundClass() const
 		return skins[player->userinfo.GetSkin()].name;
 	}
 
-	// [GRB]
-	auto pclass = GetClass();
 	return SoundClass != NAME_None? SoundClass.GetChars() : "player";
 }
 
diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp
index 29aa2e8d7..14c4791c6 100644
--- a/src/win32/i_main.cpp
+++ b/src/win32/i_main.cpp
@@ -1337,7 +1337,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE nothing, LPSTR cmdline, int n
 	_CrtSetDbgFlag (_CrtSetDbgFlag(0) | _CRTDBG_LEAK_CHECK_DF);
 
 	// Use this to break at a specific allocation number.
-	_crtBreakAlloc = 165966;
+	//_crtBreakAlloc = 53039;
 #endif
 
 	DoMain (hInstance);