core/GameConfigs.cpp
changeset 2573 9e715ee7389e
parent 2562 af4b3f9a8168
child 2578 30341024c074
     1.1 --- a/core/GameConfigs.cpp	Tue Feb 17 14:03:20 2009 -0500
     1.2 +++ b/core/GameConfigs.cpp	Tue Feb 17 15:59:51 2009 -0500
     1.3 @@ -762,15 +762,11 @@
     1.4  	bShouldBeReadingDefault = true;
     1.5  	m_ParseState = PSTATE_NONE;
     1.6  
     1.7 -	g_GameConfigs.AcquireLock();
     1.8 -
     1.9  	if ((err=textparsers->ParseSMCFile(m_CurFile, this, &state, error, maxlength))
    1.10  		!= SMCError_Okay)
    1.11  	{
    1.12  		const char *msg;
    1.13  
    1.14 -		g_GameConfigs.ReleaseLock();
    1.15 -
    1.16  		msg = textparsers->GetSMCErrorString(err);
    1.17  
    1.18  		g_Logger.LogError("[SM] Error parsing gameconfig file \"%s\":", m_CurFile);
    1.19 @@ -791,8 +787,6 @@
    1.20  		return false;
    1.21  	}
    1.22  
    1.23 -	g_GameConfigs.ReleaseLock();
    1.24 -
    1.25  	return true;
    1.26  }
    1.27  
    1.28 @@ -860,8 +854,6 @@
    1.29  
    1.30  void GameConfigManager::OnSourceModStartup(bool late)
    1.31  {
    1.32 -	m_FileLock = g_pThreader->MakeMutex();
    1.33 -
    1.34  	LoadGameConfigFile("core.games", &g_pGameConf, NULL, 0);
    1.35  
    1.36  	strncopy(g_Game, g_SourceMod.GetGameFolderName(), sizeof(g_Game));
    1.37 @@ -896,7 +888,6 @@
    1.38  void GameConfigManager::OnSourceModAllShutdown()
    1.39  {
    1.40  	CloseGameConfigFile(g_pGameConf);
    1.41 -	m_FileLock->DestroyThis();
    1.42  }
    1.43  
    1.44  bool GameConfigManager::LoadGameConfigFile(const char *file, IGameConfig **_pConfig, char *error, size_t maxlength)
    1.45 @@ -991,10 +982,8 @@
    1.46  
    1.47  void GameConfigManager::AcquireLock()
    1.48  {
    1.49 -	m_FileLock->Lock();
    1.50  }
    1.51  
    1.52  void GameConfigManager::ReleaseLock()
    1.53  {
    1.54 -	m_FileLock->Unlock();
    1.55  }