Remove over-aggressive error handling of Addresses gamedata (bug 6044, r=asherkin).

--HG--
extra : rebase_source : 704dcfdf285286814411f3dd5be2dd6e02872085
This commit is contained in:
Nicholas Hastings 2014-02-10 09:43:10 -05:00
parent e00e879af5
commit 5abd9edf62

View File

@ -601,19 +601,11 @@ skip_find:
{ {
m_ParseState = PSTATE_GAMEDEFS_ADDRESSES; 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;
}
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); AddressConf addrConf(m_AddressSignature, sizeof(m_AddressSignature), m_AddressReadCount, m_AddressRead);
m_Addresses.replace(m_Address, addrConf); m_Addresses.replace(m_Address, addrConf);
}
break; break;
} }