Merge pull request #336 from Arkshine/update/gameconfigs
Update GameConfig
This commit is contained in:
commit
2a90fc0fe8
@ -637,7 +637,6 @@ bool CGameConfig::Reparse(char *error, size_t maxlength)
|
||||
|
||||
if (!g_LibSys.PathExists(path))
|
||||
{
|
||||
#if 0
|
||||
// Single config file without master
|
||||
g_LibSys.PathFormat(path, sizeof(path), "%s.txt", m_File);
|
||||
|
||||
@ -645,14 +644,22 @@ bool CGameConfig::Reparse(char *error, size_t maxlength)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Allow customizations of default gamedata files
|
||||
build_pathname_r(path, sizeof(path), "%s/gamedata/custom/%s.txt", dataDir, m_File);
|
||||
|
||||
if (g_LibSys.PathExists(path))
|
||||
{
|
||||
g_LibSys.PathFormat(path, sizeof(path), "custom/%s.txt", m_File);
|
||||
return EnterFile(path, error, maxlength);
|
||||
|
||||
auto success = EnterFile(path, error, maxlength);
|
||||
|
||||
if (success)
|
||||
{
|
||||
AMXXLOG_Log("[AMXX] Parsed custom gamedata override file: %s", path);
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -719,6 +726,8 @@ bool CGameConfig::Reparse(char *error, size_t maxlength)
|
||||
return false;
|
||||
}
|
||||
|
||||
AMXXLOG_Log("[AMXX] Parsed custom gamedata override file: %s", path);
|
||||
|
||||
customDir->NextEntry();
|
||||
}
|
||||
|
||||
|
@ -24,6 +24,7 @@ static cell AMX_NATIVE_CALL LoadGameConfigFile(AMX *amx, cell *params)
|
||||
|
||||
if (!ConfigManager.LoadGameConfigFile(filename, &config, error, sizeof(error)))
|
||||
{
|
||||
ConfigManager.CloseGameConfigFile(config);
|
||||
LogError(amx, AMX_ERR_NATIVE, "Unable to open %s: %s", filename, error);
|
||||
return 0;
|
||||
}
|
||||
@ -31,7 +32,7 @@ static cell AMX_NATIVE_CALL LoadGameConfigFile(AMX *amx, cell *params)
|
||||
int handle = GameConfigHandle.create();
|
||||
|
||||
auto configHandle = GameConfigHandle.lookup(handle);
|
||||
|
||||
|
||||
if (!configHandle)
|
||||
{
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user