actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PrefsManager.cpp
+13 -14
View File
@@ -1,6 +1,5 @@
#include "global.h"
#include "PrefsManager.h"
#include "Foreach.h"
#include "IniFile.h"
#include "LuaManager.h"
#include "Preference.h"
@@ -20,7 +19,7 @@
//STATIC_INI_PATH = "Data/Static.ini"; // overlay on the 2 above, can't be overridden
//TYPE_TXT_FILE = "Data/Type.txt";
PrefsManager* PREFSMAN = NULL; // global and accessible from anywhere in our program
PrefsManager* PREFSMAN = nullptr; // global and accessible from anywhere in our program
static const char *MusicWheelUsesSectionsNames[] = {
"Never",
@@ -371,7 +370,7 @@ void PrefsManager::StoreGamePrefs()
ASSERT( !m_sCurrentGame.Get().empty() );
// save off old values
GamePrefs &gp = m_mapGameNameToGamePrefs[m_sCurrentGame.Get()];
GamePrefs &gp = m_mapGameNameToGamePrefs.at(m_sCurrentGame.Get());
gp.m_sAnnouncer = m_sAnnouncer;
gp.m_sTheme = m_sTheme;
gp.m_sDefaultModifiers = m_sDefaultModifiers;
@@ -446,7 +445,7 @@ void PrefsManager::ReadPrefsFromIni( const IniFile &ini, const RString &sSection
/*
IPreference *pPref = PREFSMAN->GetPreferenceByName( *sName );
if( pPref == NULL )
if( pPref == nullptr )
{
LOG->Warn( "Unknown preference in [%s]: %s", sClassName.c_str(), sName->c_str() );
continue;
@@ -514,18 +513,18 @@ void PrefsManager::SavePrefsToIni( IniFile &ini )
StoreGamePrefs();
XNode* pNode = ini.GetChild( "Options" );
if( pNode == NULL )
if( pNode == nullptr )
pNode = ini.AppendChild( "Options" );
IPreference::SavePrefsToNode( pNode );
FOREACHM_CONST( RString, GamePrefs, m_mapGameNameToGamePrefs, iter )
for (auto const &iter : m_mapGameNameToGamePrefs)
{
RString sSection = "Game-" + RString( iter->first );
RString sSection = "Game-" + RString( iter.first );
// todo: write more values here? -aj
ini.SetValue( sSection, "Announcer", iter->second.m_sAnnouncer );
ini.SetValue( sSection, "Theme", iter->second.m_sTheme );
ini.SetValue( sSection, "DefaultModifiers", iter->second.m_sDefaultModifiers );
ini.SetValue( sSection, "Announcer", iter.second.m_sAnnouncer );
ini.SetValue( sSection, "Theme", iter.second.m_sTheme );
ini.SetValue( sSection, "DefaultModifiers", iter.second.m_sDefaultModifiers );
}
}
@@ -555,7 +554,7 @@ public:
{
RString sName = SArg(1);
IPreference *pPref = IPreference::GetPreferenceByName( sName );
if( pPref == NULL )
if( pPref == nullptr )
{
LuaHelpers::ReportScriptErrorFmt( "GetPreference: unknown preference \"%s\"", sName.c_str() );
lua_pushnil( L );
@@ -570,7 +569,7 @@ public:
RString sName = SArg(1);
IPreference *pPref = IPreference::GetPreferenceByName( sName );
if( pPref == NULL )
if( pPref == nullptr )
{
LuaHelpers::ReportScriptErrorFmt( "SetPreference: unknown preference \"%s\"", sName.c_str() );
COMMON_RETURN_SELF;
@@ -585,7 +584,7 @@ public:
RString sName = SArg(1);
IPreference *pPref = IPreference::GetPreferenceByName( sName );
if( pPref == NULL )
if( pPref == nullptr )
{
LuaHelpers::ReportScriptErrorFmt( "SetPreferenceToDefault: unknown preference \"%s\"", sName.c_str() );
COMMON_RETURN_SELF;
@@ -600,7 +599,7 @@ public:
RString sName = SArg(1);
IPreference *pPref = IPreference::GetPreferenceByName( sName );
if( pPref == NULL )
if( pPref == nullptr )
{
lua_pushboolean( L, false );
return 1;