From f1ebbe330dc4cfd7bf952883848c20238c4766a1 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 23 May 2004 23:24:44 +0000
Subject: [PATCH] reduce xbox hackery

---
 stepmania/src/PrefsManager.cpp |  6 +++---
 stepmania/src/PrefsManager.h   |  2 +-
 stepmania/src/RageDisplay.h    | 10 ++--------
 stepmania/src/StepMania.cpp    |  6 ++----
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 808235c411..8c5087add6 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -238,9 +238,9 @@ void PrefsManager::Init()
 	m_bEditorShowBGChangesPlay = false;
 
 	/* XXX: Set these defaults for individual consoles using VideoCardDefaults.ini. */
+	m_bPAL = false;
 #ifdef _XBOX
 	m_bInterlaced = true;
-	m_bPAL = false;
 	m_fScreenPosX = 0;
 	m_fScreenPosY = 0;
 	m_fScreenWidth = 640;
@@ -323,8 +323,8 @@ void PrefsManager::ReadPrefsFromFile( CString sIni )
 
 	ini.GetValue( "Options", "Windowed",						m_bWindowed );
 	ini.GetValue( "Options", "Interlaced",						m_bInterlaced );
-#ifdef _XBOX
 	ini.GetValue( "Options", "PAL",								m_bPAL );
+#ifdef _XBOX
 	ini.GetValue( "Options", "ScreenPosX",						m_fScreenPosX );
 	ini.GetValue( "Options", "ScreenPosY",						m_fScreenPosY );
 	ini.GetValue( "Options", "ScreenWidth",						m_fScreenWidth );
@@ -652,8 +652,8 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
 	ini.SetValue( "Options", "HiddenSongs",						m_bHiddenSongs );
 	ini.SetValue( "Options", "Vsync",							m_bVsync );
 	ini.SetValue( "Options", "Interlaced",						m_bInterlaced );
-#ifdef _XBOX
 	ini.SetValue( "Options", "PAL",								m_bPAL );
+#ifdef _XBOX
 	ini.SetValue( "Options", "ScreenPosX",						m_fScreenPosX );
 	ini.SetValue( "Options", "ScreenPosY",						m_fScreenPosY );
 	ini.SetValue( "Options", "ScreenWidth",						m_fScreenWidth );
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index 97917fbcde..f0e0cbfa1d 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -39,8 +39,8 @@ public:
 	bool			m_bHiddenSongs;
 	bool			m_bVsync;
 	bool			m_bInterlaced;
-#ifdef _XBOX
 	bool			m_bPAL;
+#ifdef _XBOX
 	float			m_fScreenPosX;
 	float			m_fScreenPosY;
 	float			m_fScreenWidth;
diff --git a/stepmania/src/RageDisplay.h b/stepmania/src/RageDisplay.h
index 4c1fcc27c3..be16d5d05e 100644
--- a/stepmania/src/RageDisplay.h
+++ b/stepmania/src/RageDisplay.h
@@ -111,10 +111,8 @@ public:
 			bool bTrilinearFiltering_,
 			bool bAnisotropicFiltering_,
 			CString sWindowTitle_,
-			CString sIconFile_
-#ifdef _XBOX
-			, bool PAL_
-#endif
+			CString sIconFile_,
+			bool PAL_
 		)
 		{
 			windowed = windowed_;
@@ -129,9 +127,7 @@ public:
 			bAnisotropicFiltering = bAnisotropicFiltering_;
 			sWindowTitle = sWindowTitle_;
 			sIconFile = sIconFile_;
-#ifdef _XBOX
 			PAL = PAL_;
-#endif
 		}
 		VideoModeParams() {}
 
@@ -145,9 +141,7 @@ public:
 		bool bTrilinearFiltering;
 		bool bAnisotropicFiltering;
 		bool interlaced;
-#ifdef _XBOX
 		bool PAL;
-#endif
 		CString sWindowTitle;
 		CString sIconFile;
 	};
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 02008d8f19..c9f2cf489f 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -118,10 +118,8 @@ static RageDisplay::VideoModeParams GetCurVideoModeParams()
 			PREFSMAN->m_bTrilinearFiltering,
 			PREFSMAN->m_bAnisotropicFiltering,
 			THEME->GetMetric("Common","WindowTitle"),
-			THEME->GetPathToG("Common window icon")
-#ifdef _XBOX
-			, PREFSMAN->m_bPAL
-#endif
+			THEME->GetPathToG("Common window icon"),
+			PREFSMAN->m_bPAL
 	);
 }