From 702c81cf1cc6211778372d361b6c6df292cc7e78 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 27 Oct 2005 12:46:05 +0000
Subject: [PATCH] fix compile

---
 stepmania/src/ScreenProfileOptions.cpp           | 16 ++++++++--------
 stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp |  2 +-
 stepmania/src/arch/Dialog/Dialog.cpp             |  2 +-
 stepmania/src/arch/Dialog/DialogDriver_Win32.cpp |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/ScreenProfileOptions.cpp b/stepmania/src/ScreenProfileOptions.cpp
index b36c0595c9..b1e4045581 100644
--- a/stepmania/src/ScreenProfileOptions.cpp
+++ b/stepmania/src/ScreenProfileOptions.cpp
@@ -63,15 +63,15 @@ void ScreenProfileOptions::Init()
 	g_ProfileOptionsLines[PO_RENAME_].m_vsChoices.push_back( "-NONE-" );
 	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-";
 	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-";
 	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
 	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( 
 				vsProfiles.begin(),
 				vsProfiles.end(),
-				PREFSMAN->GetDefaultLocalProfileID(pn).Get() );
+				PREFSMAN->m_sMemoryCardOsMountPoint[pn].Get() );
 			if( iter != vsProfiles.end() )
 				m_pRows[iRow]->SetOneSharedSelection( iter - vsProfiles.begin() + 1 );
 		}
@@ -117,9 +117,9 @@ void ScreenProfileOptions::ExportOptions( int iRow, const vector<PlayerNumber> &
 			PROFILEMAN->GetLocalProfileIDs( vsProfiles );
 
 			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
-				PREFSMAN->GetDefaultLocalProfileID(pn).Set( "" );
+				PREFSMAN->m_sMemoryCardOsMountPoint[pn].Set( "" );
 		}
 		break;
 	}
@@ -129,7 +129,7 @@ void ScreenProfileOptions::HandleScreenMessage( const ScreenMessage SM )
 {
 	if( SM == SM_GoToNextScreen )
 	{
-		PREFSMAN->SaveGlobalPrefsToDisk();
+		PREFSMAN->SavePrefsToDisk();
 		SCREENMAN->SetNewScreen( "ScreenOptionsService" );
 		return;
 	}
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
index 6b05bd0d9c..3d463c3f6e 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
@@ -106,7 +106,7 @@ static void IgnoreMessage( CString ID )
 	split( PREFSMAN->m_sIgnoredMessageWindows, ",", list );
 	list.push_back( ID );
 	PREFSMAN->m_sIgnoredMessageWindows.Set( join(",",list) );
-	PREFSMAN->SaveGlobalPrefsToDisk();
+	PREFSMAN->SavePrefsToDisk();
 }
 
 /*
diff --git a/stepmania/src/arch/Dialog/Dialog.cpp b/stepmania/src/arch/Dialog/Dialog.cpp
index c8295b300c..e91ff88839 100644
--- a/stepmania/src/arch/Dialog/Dialog.cpp
+++ b/stepmania/src/arch/Dialog/Dialog.cpp
@@ -108,7 +108,7 @@ void Dialog::IgnoreMessage( CString sID )
 	split( PREFSMAN->m_sIgnoredMessageWindows, ",", asList );
 	asList.push_back( sID );
 	PREFSMAN->m_sIgnoredMessageWindows.Set( join(",",asList) );
-	PREFSMAN->SaveGlobalPrefsToDisk();
+	PREFSMAN->SavePrefsToDisk();
 }
 
 void Dialog::Error( CString sMessage, CString sID )
diff --git a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp
index 71393b272d..caf1bde9ff 100644
--- a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp
+++ b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp
@@ -142,7 +142,7 @@ void DialogDriver_Win32::Error( CString sError, CString sID )
 
 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 ) )
 	{
@@ -155,7 +155,7 @@ Dialog::Result DialogDriver_Win32::AbortRetryIgnore( CString sMessage, CString I
 
 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) )
 	{