Reverted some changes that should not have been part of the merge from Midiman.

This commit is contained in:
Kyzentun
2014-08-28 05:53:37 -06:00
parent 04da3fb9c7
commit bedaf07e51
4 changed files with 10 additions and 18 deletions
+1 -1
View File
@@ -136,7 +136,7 @@ function PlayerScoreColor( pn )
return color("1,1,1,1")
end
function CustomDifficultyToColor( sCustomDifficulty )
function CustomDifficultyToColor( sCustomDifficulty )
return GameColor.Difficulty[sCustomDifficulty]
end
+5 -5
View File
@@ -82,17 +82,17 @@ ThemePrefs =
-- If we don't have IniFile, we can't read/write from/to disk
if not IniFile then Warn( GetString("IniFileMissing") ) end
Trace( ("ThemePrefs.Init(prefs, %s)"):format(tostring(bLoadFromDisk)) )
-- Trace( ("ThemePrefs.Init(prefs, %s)"):format(tostring(bLoadFromDisk)) )
if bLoadFromDisk then
Trace( "ThemePrefs.Init: loading from disk" )
if not ThemePrefs.Load() then return false end
end
Trace( "ThemePrefs.Init: not loading from disk" )
-- Trace( "ThemePrefs.Init: not loading from disk" )
-- create the section if it doesn't exist
local section = GetThemeName()
Trace( ("ThemePrefs.Init: Theme name is \"%s\""):format(section) )
-- Trace( ("ThemePrefs.Init: Theme name is \"%s\""):format(section) )
PrefsTable[section] = PrefsTable[section] and PrefsTable[section] or { }
--Trace( "Using section " .. section )
@@ -105,7 +105,7 @@ ThemePrefs =
end
end
PrintTable( PrefsTable[section] )
-- PrintTable( PrefsTable[section] )
end,
Load = function()
@@ -115,7 +115,7 @@ ThemePrefs =
end,
Save = function()
Trace( "ThemePrefs.Save" )
-- Trace( "ThemePrefs.Save" )
if not IniFile then return false end
if not NeedsSaved then return end
NeedsSaved = false