From cd58e16d9c99a10d848d0e7bfefe9c0458546227 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Mon, 10 Feb 2014 10:02:29 -0500 Subject: [PATCH] Remove over-aggressive error handling of Addresses gamedata (bug 6044, r=asherkin). --- core/logic/GameConfigs.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/core/logic/GameConfigs.cpp b/core/logic/GameConfigs.cpp index 314603ab..cd868830 100644 --- a/core/logic/GameConfigs.cpp +++ b/core/logic/GameConfigs.cpp @@ -607,19 +607,11 @@ skip_find: { m_ParseState = PSTATE_GAMEDEFS_ADDRESSES; - if (m_Address[0] == '\0') + if (m_Address[0] != '\0' && m_AddressSignature[0] != '\0') { - smcore.LogError("[SM] Address sections must have names (gameconf \"%s\")", m_CurFile); - break; + AddressConf addrConf(m_AddressSignature, sizeof(m_AddressSignature), m_AddressReadCount, m_AddressRead); + m_Addresses.replace(m_Address, addrConf); } - if (m_AddressSignature[0] == '\0') - { - smcore.LogError("[SM] Address section for \"%s\" did not specify a signature (gameconf \"%s\")", m_Address, m_CurFile); - break; - } - - AddressConf addrConf(m_AddressSignature, sizeof(m_AddressSignature), m_AddressReadCount, m_AddressRead); - m_pAddresses->replace(m_Address, addrConf); break; }