IniFile cleanup

This commit is contained in:
Glenn Maynard
2004-05-23 02:27:51 +00:00
parent a87aef9c3b
commit c0adadd3a5
21 changed files with 180 additions and 247 deletions
+4 -6
View File
@@ -373,9 +373,8 @@ void InputMapper::ReadMappingsFromDisk()
ClearAllMappings();
IniFile ini;
ini.SetPath( KEYMAPS_PATH );
if( !ini.ReadFile() )
LOG->Trace( "Couldn't open mapping file \"%s\": %s.", KEYMAPS_PATH, ini.error.c_str() );
if( !ini.ReadFile( KEYMAPS_PATH ) )
LOG->Trace( "Couldn't open mapping file \"%s\": %s.", KEYMAPS_PATH, ini.GetError().c_str() );
const IniFile::key *Key = ini.GetKey( GAMESTATE->GetCurrentGameDef()->m_szName );
@@ -410,8 +409,7 @@ void InputMapper::ReadMappingsFromDisk()
void InputMapper::SaveMappingsToDisk()
{
IniFile ini;
ini.SetPath( KEYMAPS_PATH );
ini.ReadFile();
ini.ReadFile( KEYMAPS_PATH );
// erase the key so that we overwrite everything for this game
ini.DeleteKey( GAMESTATE->GetCurrentGameDef()->m_szName );
@@ -432,7 +430,7 @@ void InputMapper::SaveMappingsToDisk()
}
}
ini.WriteFile();
ini.WriteFile( KEYMAPS_PATH );
}