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

fix compile

Browse Source
This commit is contained in:
Glenn Maynard
2005-10-27 12:46:05 +00:00
parent 112564dc99
commit 702c81cf1c
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenProfileOptions.cpp
+8 -8
View File
@@ -63,15 +63,15 @@ void ScreenProfileOptions::Init()
g_ProfileOptionsLines[PO_RENAME_].m_vsChoices.push_back( "-NONE-" ); g_ProfileOptionsLines[PO_RENAME_].m_vsChoices.push_back( "-NONE-" );
PROFILEMAN->GetLocalProfileDisplayNames( g_ProfileOptionsLines[PO_RENAME_].m_vsChoices ); PROFILEMAN->GetLocalProfileDisplayNames( g_ProfileOptionsLines[PO_RENAME_].m_vsChoices );
if( PREFSMAN->GetMemoryCardOsMountPoint(PLAYER_1).Get().empty() ) if( PREFSMAN->m_sMemoryCardOsMountPoint[PLAYER_1].Get().empty() )
g_ProfileOptionsLines[PO_OS_MOUNT_1].m_vsChoices[0] = "-NOT SET IN INI-"; g_ProfileOptionsLines[PO_OS_MOUNT_1].m_vsChoices[0] = "-NOT SET IN INI-";
else else
g_ProfileOptionsLines[PO_OS_MOUNT_1].m_vsChoices[0] = PREFSMAN->GetMemoryCardOsMountPoint(PLAYER_1).Get(); g_ProfileOptionsLines[PO_OS_MOUNT_1].m_vsChoices[0] = PREFSMAN->m_sMemoryCardOsMountPoint[PLAYER_1].Get();
if( PREFSMAN->GetMemoryCardOsMountPoint(PLAYER_2).Get().empty() ) if( PREFSMAN->m_sMemoryCardOsMountPoint[PLAYER_2].Get().empty() )
g_ProfileOptionsLines[PO_OS_MOUNT_2].m_vsChoices[0] = "-NOT SET IN INI-"; g_ProfileOptionsLines[PO_OS_MOUNT_2].m_vsChoices[0] = "-NOT SET IN INI-";
else else
g_ProfileOptionsLines[PO_OS_MOUNT_2].m_vsChoices[0] = PREFSMAN->GetMemoryCardOsMountPoint(PLAYER_2).Get(); g_ProfileOptionsLines[PO_OS_MOUNT_2].m_vsChoices[0] = PREFSMAN->m_sMemoryCardOsMountPoint[PLAYER_2].Get();
//Enable all lines for all players //Enable all lines for all players
for ( unsigned int i = 0; i < NUM_PROFILE_OPTIONS_LINES; i++ ) for ( unsigned int i = 0; i < NUM_PROFILE_OPTIONS_LINES; i++ )
@@ -97,7 +97,7 @@ void ScreenProfileOptions::ImportOptions( int iRow, const vector<PlayerNumber> &
CStringArray::iterator iter = find( CStringArray::iterator iter = find(
vsProfiles.begin(), vsProfiles.begin(),
vsProfiles.end(), vsProfiles.end(),
PREFSMAN->GetDefaultLocalProfileID(pn).Get() ); PREFSMAN->m_sMemoryCardOsMountPoint[pn].Get() );
if( iter != vsProfiles.end() ) if( iter != vsProfiles.end() )
m_pRows[iRow]->SetOneSharedSelection( iter - vsProfiles.begin() + 1 ); m_pRows[iRow]->SetOneSharedSelection( iter - vsProfiles.begin() + 1 );
} }
@@ -117,9 +117,9 @@ void ScreenProfileOptions::ExportOptions( int iRow, const vector<PlayerNumber> &
PROFILEMAN->GetLocalProfileIDs( vsProfiles ); PROFILEMAN->GetLocalProfileIDs( vsProfiles );
if( m_pRows[iRow]->GetOneSharedSelection() > 0 ) if( m_pRows[iRow]->GetOneSharedSelection() > 0 )
PREFSMAN->GetDefaultLocalProfileID(pn).Set( vsProfiles[m_pRows[iRow]->GetOneSharedSelection()-1] ); PREFSMAN->m_sMemoryCardOsMountPoint[pn].Set( vsProfiles[m_pRows[iRow]->GetOneSharedSelection()-1] );
else else
PREFSMAN->GetDefaultLocalProfileID(pn).Set( "" ); PREFSMAN->m_sMemoryCardOsMountPoint[pn].Set( "" );
} }
break; break;
} }
@@ -129,7 +129,7 @@ void ScreenProfileOptions::HandleScreenMessage( const ScreenMessage SM )
{ {
if( SM == SM_GoToNextScreen ) if( SM == SM_GoToNextScreen )
{ {
PREFSMAN->SaveGlobalPrefsToDisk(); PREFSMAN->SavePrefsToDisk();
SCREENMAN->SetNewScreen( "ScreenOptionsService" ); SCREENMAN->SetNewScreen( "ScreenOptionsService" );
return; return;
} }
stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ static void IgnoreMessage( CString ID )
split( PREFSMAN->m_sIgnoredMessageWindows, ",", list ); split( PREFSMAN->m_sIgnoredMessageWindows, ",", list );
list.push_back( ID ); list.push_back( ID );
PREFSMAN->m_sIgnoredMessageWindows.Set( join(",",list) ); PREFSMAN->m_sIgnoredMessageWindows.Set( join(",",list) );
PREFSMAN->SaveGlobalPrefsToDisk(); PREFSMAN->SavePrefsToDisk();
} }
/* /*
stepmania/src/arch/Dialog/Dialog.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ void Dialog::IgnoreMessage( CString sID )
split( PREFSMAN->m_sIgnoredMessageWindows, ",", asList ); split( PREFSMAN->m_sIgnoredMessageWindows, ",", asList );
asList.push_back( sID ); asList.push_back( sID );
PREFSMAN->m_sIgnoredMessageWindows.Set( join(",",asList) ); PREFSMAN->m_sIgnoredMessageWindows.Set( join(",",asList) );
PREFSMAN->SaveGlobalPrefsToDisk(); PREFSMAN->SavePrefsToDisk();
} }
void Dialog::Error( CString sMessage, CString sID ) void Dialog::Error( CString sMessage, CString sID )
stepmania/src/arch/Dialog/DialogDriver_Win32.cpp
+2 -2
View File
@@ -142,7 +142,7 @@ void DialogDriver_Win32::Error( CString sError, CString sID )
Dialog::Result DialogDriver_Win32::AbortRetryIgnore( CString sMessage, CString ID ) Dialog::Result DialogDriver_Win32::AbortRetryIgnore( CString sMessage, CString ID )
{ {
CString sWindowTitle = WINDOW_TITLE.IsLoaded() ? WINDOW_TITLE.GetValue() : ""; CString sWindowTitle = CommonMetrics::WINDOW_TITLE.IsLoaded() ? CommonMetrics::WINDOW_TITLE.GetValue() : "";
switch( MessageBox(GraphicsWindow::GetHwnd(), sMessage, sWindowTitle, MB_ABORTRETRYIGNORE|MB_DEFBUTTON3 ) ) switch( MessageBox(GraphicsWindow::GetHwnd(), sMessage, sWindowTitle, MB_ABORTRETRYIGNORE|MB_DEFBUTTON3 ) )
{ {
@@ -155,7 +155,7 @@ Dialog::Result DialogDriver_Win32::AbortRetryIgnore( CString sMessage, CString I
Dialog::Result DialogDriver_Win32::AbortRetry( CString sMessage, CString sID ) Dialog::Result DialogDriver_Win32::AbortRetry( CString sMessage, CString sID )
{ {
CString sWindowTitle = WINDOW_TITLE.IsLoaded() ? WINDOW_TITLE.GetValue() : ""; CString sWindowTitle = CommonMetrics::WINDOW_TITLE.IsLoaded() ? CommonMetrics::WINDOW_TITLE.GetValue() : "";
switch( MessageBox(GraphicsWindow::GetHwnd(), sMessage, sWindowTitle, MB_RETRYCANCEL) ) switch( MessageBox(GraphicsWindow::GetHwnd(), sMessage, sWindowTitle, MB_RETRYCANCEL) )
{ {