From 2bc48fc1e7da940b715b7dbdbf5717344fab783b Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Mon, 23 Mar 2009 21:35:26 +0000
Subject: [PATCH] Stop relying on XML default values from DTDs

This was SVN commit r6767.
---
 source/graphics/TerrainProperties.cpp | 5 +++--
 source/gui/CGUI.cpp                   | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/graphics/TerrainProperties.cpp b/source/graphics/TerrainProperties.cpp
index e3619aad43..9aef72df84 100644
--- a/source/graphics/TerrainProperties.cpp
+++ b/source/graphics/TerrainProperties.cpp
@@ -182,8 +182,10 @@ void CTerrainProperties::ReadPassability(bool passable, XMBElement node, CXeromy
 	#undef ATTR
 
 	STerrainPassability pass(passable);
+	// Set default speed
+	pass.m_SpeedFactor = 100;
+
 	bool hasType = false;
-	bool hasSpeed;
 	XMBAttributeList attribs = node.GetAttributes();
 	for (int i=0;i<attribs.Count;i++)
 	{
@@ -205,7 +207,6 @@ void CTerrainProperties::ReadPassability(bool passable, XMBElement node, CXeromy
 				pass.m_SpeedFactor /= 100.0;
 			}
 			// FIXME speed=0 could/should be made to set the terrain impassable
-			hasSpeed = true;
 		}
 		else if (attr.Name == attr_effect)
 		{
diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp
index 2ece80e2e6..88f4ec7cea 100644
--- a/source/gui/CGUI.cpp
+++ b/source/gui/CGUI.cpp
@@ -1207,6 +1207,8 @@ void CGUI::Xeromyces_ReadObject(XMBElement Element, CXeromyces* pFile, IGUIObjec
 
 	// Well first of all we need to determine the type
 	CStr type (attributes.GetNamedItem(pFile->GetAttributeID("type")));
+	if (type.empty())
+		type = "empty";
 
 	// Construct object from specified type
 	//  henceforth, we need to do a rollback before aborting.