From 66d84907817a59f77ef96a7a03882d1f1fbfd7c6 Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Thu, 26 Feb 2015 21:31:20 -0700
Subject: [PATCH] Changed PainDisplay to print errors when MetricsGroup or
 PlayerNumber are not supplied instead of asserting.

---
 src/PaneDisplay.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/PaneDisplay.cpp b/src/PaneDisplay.cpp
index ac979bcfe0..2098f30ea9 100644
--- a/src/PaneDisplay.cpp
+++ b/src/PaneDisplay.cpp
@@ -99,13 +99,25 @@ void PaneDisplay::LoadFromNode( const XNode *pNode )
 
 	RString sMetricsGroup;
 	b = pNode->GetAttrValue( "MetricsGroup", sMetricsGroup );
-	ASSERT( b );
+	if(!b)
+	{
+		sMetricsGroup= "PaneDisplay";
+		LuaHelpers::ReportScriptError("PaneDisplay must have a MetricsGroup specified.");
+	}
 
 	Lua *L = LUA->Get();
 	b = pNode->PushAttrValue( L, "PlayerNumber" );
-	ASSERT( b );
 	PlayerNumber pn;
-	LuaHelpers::Pop( L, pn );
+	if(!b)
+	{
+		lua_pop(L, 1);
+		pn= GAMESTATE->GetMasterPlayerNumber();
+		LuaHelpers::ReportScriptError("PaneDisplay must have a PlayerNumber specified.");
+	}
+	else
+	{
+		LuaHelpers::Pop( L, pn );
+	}
 	LUA->Release( L );
 
 	Load( sMetricsGroup, pn );