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

fix [Common] DefaultModifers not being applied in most places

Browse Source
This commit is contained in:
Chris Danford
2005-10-27 07:51:37 +00:00
parent 6dc474d41b
commit 112564dc99
8 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMasterPrefs.cpp
+6 -6
View File
@@ -16,13 +16,13 @@
#include "Foreach.h"
#include "GameConstantsAndTypes.h"
static void GetDefaultModifiers( PlayerOptions &po, SongOptions &so )
static void GetPrefsDefaultModifiers( PlayerOptions &po, SongOptions &so )
{
po.FromString( PREFSMAN->GetCurrentGamePrefs().m_sDefaultModifiers );
so.FromString( PREFSMAN->GetCurrentGamePrefs().m_sDefaultModifiers );
}
static void SetDefaultModifiers( const PlayerOptions &po, const SongOptions &so )
static void SetPrefsDefaultModifiers( const PlayerOptions &po, const SongOptions &so )
{
CStringArray as;
if( po.GetString() != "" )
@@ -246,9 +246,9 @@ static void DefaultNoteSkin( int &sel, bool ToSel, const ConfOption *pConfOption
} else {
PlayerOptions po;
SongOptions so;
GetDefaultModifiers( po, so );
GetPrefsDefaultModifiers( po, so );
po.m_sNoteSkin = choices[sel];
SetDefaultModifiers( po, so );
SetPrefsDefaultModifiers( po, so );
}
}
@@ -404,7 +404,7 @@ static void DefaultFailType( int &sel, bool ToSel, const ConfOption *pConfOption
{
PlayerOptions po;
SongOptions so;
GetDefaultModifiers( po, so );
GetPrefsDefaultModifiers( po, so );
switch( sel )
{
@@ -415,7 +415,7 @@ static void DefaultFailType( int &sel, bool ToSel, const ConfOption *pConfOption
ASSERT(0);
}
SetDefaultModifiers( po, so );
SetPrefsDefaultModifiers( po, so );
}
}