reduce xbox hackery

This commit is contained in:
Glenn Maynard
2004-05-23 23:24:44 +00:00
parent ea2c3d6260
commit f1ebbe330d
4 changed files with 8 additions and 16 deletions
+3 -3
View File
@@ -238,9 +238,9 @@ void PrefsManager::Init()
m_bEditorShowBGChangesPlay = false; m_bEditorShowBGChangesPlay = false;
/* XXX: Set these defaults for individual consoles using VideoCardDefaults.ini. */ /* XXX: Set these defaults for individual consoles using VideoCardDefaults.ini. */
m_bPAL = false;
#ifdef _XBOX #ifdef _XBOX
m_bInterlaced = true; m_bInterlaced = true;
m_bPAL = false;
m_fScreenPosX = 0; m_fScreenPosX = 0;
m_fScreenPosY = 0; m_fScreenPosY = 0;
m_fScreenWidth = 640; m_fScreenWidth = 640;
@@ -323,8 +323,8 @@ void PrefsManager::ReadPrefsFromFile( CString sIni )
ini.GetValue( "Options", "Windowed", m_bWindowed ); ini.GetValue( "Options", "Windowed", m_bWindowed );
ini.GetValue( "Options", "Interlaced", m_bInterlaced ); ini.GetValue( "Options", "Interlaced", m_bInterlaced );
#ifdef _XBOX
ini.GetValue( "Options", "PAL", m_bPAL ); ini.GetValue( "Options", "PAL", m_bPAL );
#ifdef _XBOX
ini.GetValue( "Options", "ScreenPosX", m_fScreenPosX ); ini.GetValue( "Options", "ScreenPosX", m_fScreenPosX );
ini.GetValue( "Options", "ScreenPosY", m_fScreenPosY ); ini.GetValue( "Options", "ScreenPosY", m_fScreenPosY );
ini.GetValue( "Options", "ScreenWidth", m_fScreenWidth ); ini.GetValue( "Options", "ScreenWidth", m_fScreenWidth );
@@ -652,8 +652,8 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
ini.SetValue( "Options", "HiddenSongs", m_bHiddenSongs ); ini.SetValue( "Options", "HiddenSongs", m_bHiddenSongs );
ini.SetValue( "Options", "Vsync", m_bVsync ); ini.SetValue( "Options", "Vsync", m_bVsync );
ini.SetValue( "Options", "Interlaced", m_bInterlaced ); ini.SetValue( "Options", "Interlaced", m_bInterlaced );
#ifdef _XBOX
ini.SetValue( "Options", "PAL", m_bPAL ); ini.SetValue( "Options", "PAL", m_bPAL );
#ifdef _XBOX
ini.SetValue( "Options", "ScreenPosX", m_fScreenPosX ); ini.SetValue( "Options", "ScreenPosX", m_fScreenPosX );
ini.SetValue( "Options", "ScreenPosY", m_fScreenPosY ); ini.SetValue( "Options", "ScreenPosY", m_fScreenPosY );
ini.SetValue( "Options", "ScreenWidth", m_fScreenWidth ); ini.SetValue( "Options", "ScreenWidth", m_fScreenWidth );
+1 -1
View File
@@ -39,8 +39,8 @@ public:
bool m_bHiddenSongs; bool m_bHiddenSongs;
bool m_bVsync; bool m_bVsync;
bool m_bInterlaced; bool m_bInterlaced;
#ifdef _XBOX
bool m_bPAL; bool m_bPAL;
#ifdef _XBOX
float m_fScreenPosX; float m_fScreenPosX;
float m_fScreenPosY; float m_fScreenPosY;
float m_fScreenWidth; float m_fScreenWidth;
+2 -8
View File
@@ -111,10 +111,8 @@ public:
bool bTrilinearFiltering_, bool bTrilinearFiltering_,
bool bAnisotropicFiltering_, bool bAnisotropicFiltering_,
CString sWindowTitle_, CString sWindowTitle_,
CString sIconFile_ CString sIconFile_,
#ifdef _XBOX bool PAL_
, bool PAL_
#endif
) )
{ {
windowed = windowed_; windowed = windowed_;
@@ -129,9 +127,7 @@ public:
bAnisotropicFiltering = bAnisotropicFiltering_; bAnisotropicFiltering = bAnisotropicFiltering_;
sWindowTitle = sWindowTitle_; sWindowTitle = sWindowTitle_;
sIconFile = sIconFile_; sIconFile = sIconFile_;
#ifdef _XBOX
PAL = PAL_; PAL = PAL_;
#endif
} }
VideoModeParams() {} VideoModeParams() {}
@@ -145,9 +141,7 @@ public:
bool bTrilinearFiltering; bool bTrilinearFiltering;
bool bAnisotropicFiltering; bool bAnisotropicFiltering;
bool interlaced; bool interlaced;
#ifdef _XBOX
bool PAL; bool PAL;
#endif
CString sWindowTitle; CString sWindowTitle;
CString sIconFile; CString sIconFile;
}; };
+2 -4
View File
@@ -118,10 +118,8 @@ static RageDisplay::VideoModeParams GetCurVideoModeParams()
PREFSMAN->m_bTrilinearFiltering, PREFSMAN->m_bTrilinearFiltering,
PREFSMAN->m_bAnisotropicFiltering, PREFSMAN->m_bAnisotropicFiltering,
THEME->GetMetric("Common","WindowTitle"), THEME->GetMetric("Common","WindowTitle"),
THEME->GetPathToG("Common window icon") THEME->GetPathToG("Common window icon"),
#ifdef _XBOX PREFSMAN->m_bPAL
, PREFSMAN->m_bPAL
#endif
); );
} }