Remove over-aggressive error handling of Addresses gamedata (bug 6044, r=asherkin).
authorNicholas Hastings <skamonkey@gmail.com>
Mon Feb 10 09:43:10 2014 -0500 (2014-02-10)
changeset 424295bc548f5857
parent 4241 46fdb8cd9883
child 4243 4ca955072e59
Remove over-aggressive error handling of Addresses gamedata (bug 6044, r=asherkin).
core/logic/GameConfigs.cpp
     1.1 --- a/core/logic/GameConfigs.cpp	Sun Feb 09 22:50:20 2014 -0600
     1.2 +++ b/core/logic/GameConfigs.cpp	Mon Feb 10 09:43:10 2014 -0500
     1.3 @@ -601,20 +601,12 @@
     1.4  		{
     1.5  			m_ParseState = PSTATE_GAMEDEFS_ADDRESSES;
     1.6  
     1.7 -			if (m_Address[0] == '\0')
     1.8 -			{
     1.9 -				smcore.LogError("[SM] Address sections must have names (gameconf \"%s\")", m_CurFile);
    1.10 -				break;
    1.11 -			}
    1.12 -			if (m_AddressSignature[0] == '\0')
    1.13 +			if (m_Address[0] != '\0' && m_AddressSignature[0] != '\0')
    1.14  			{
    1.15 -				smcore.LogError("[SM] Address section for \"%s\" did not specify a signature (gameconf \"%s\")", m_Address, m_CurFile);
    1.16 -				break;
    1.17 +				AddressConf addrConf(m_AddressSignature, sizeof(m_AddressSignature), m_AddressReadCount, m_AddressRead);
    1.18 +				m_Addresses.replace(m_Address, addrConf);
    1.19  			}
    1.20  
    1.21 -			AddressConf addrConf(m_AddressSignature, sizeof(m_AddressSignature), m_AddressReadCount, m_AddressRead);
    1.22 -			m_Addresses.replace(m_Address, addrConf);
    1.23 -
    1.24  			break;
    1.25  		}
    1.26  	case PSTATE_GAMEDEFS_ADDRESSES_ADDRESS_READ: