diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 19c7e6342e..c89e5f7a73 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -236,11 +236,6 @@ void PrefsManager::Init() m_bPAL = false; #ifdef _XBOX m_bInterlaced = true; - m_fScreenPosX = 0; - m_fScreenPosY = 0; - m_fScreenWidth = 640; - m_fScreenHeight = 480; - resizing = false; #else m_bInterlaced = false; #endif @@ -331,12 +326,6 @@ void PrefsManager::ReadPrefsFromFile( CString sIni ) ini.GetValue( "Options", "Windowed", m_bWindowed ); ini.GetValue( "Options", "Interlaced", m_bInterlaced ); 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 ); - ini.GetValue( "Options", "ScreenHeight", m_fScreenHeight ); -#endif ini.GetValue( "Options", "CelShadeModels", m_bCelShadeModels ); ini.GetValue( "Options", "ConstantUpdateDeltaSeconds", m_fConstantUpdateDeltaSeconds ); ini.GetValue( "Options", "DisplayWidth", m_iDisplayWidth ); @@ -673,12 +662,6 @@ void PrefsManager::SaveGlobalPrefsToDisk() const ini.SetValue( "Options", "Vsync", m_bVsync ); ini.SetValue( "Options", "Interlaced", m_bInterlaced ); 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 ); - ini.SetValue( "Options", "ScreenHeight", m_fScreenHeight ); -#endif ini.SetValue( "Options", "HowToPlay", m_bInstructions ); ini.SetValue( "Options", "Caution", m_bShowDontDie ); ini.SetValue( "Options", "ShowSelectGroup", m_bShowSelectGroup ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 75f7ba5c45..0bb00062b8 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -32,13 +32,6 @@ public: bool m_bVsync; bool m_bInterlaced; bool m_bPAL; -#ifdef _XBOX - float m_fScreenPosX; - float m_fScreenPosY; - float m_fScreenWidth; - float m_fScreenHeight; - bool resizing; // true when in the screen center screen -#endif bool m_bDelayedTextureDelete; bool m_bTexturePreload; bool m_bDelayedScreenLoad; diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp index 61fc2cae0e..8de613bbc3 100644 --- a/stepmania/src/RageDisplay_D3D.cpp +++ b/stepmania/src/RageDisplay_D3D.cpp @@ -589,14 +589,10 @@ CString RageDisplay_D3D::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut ) void RageDisplay_D3D::ResolutionChanged() { #ifdef _XBOX - g_CurrentParams.width = (int)PREFSMAN->m_fScreenWidth; - g_CurrentParams.height = (int)PREFSMAN->m_fScreenHeight; - D3DVIEWPORT8 viewData2 = { 0,0,640,480, 0.f, 1.f }; - g_pd3dDevice->SetViewport( &viewData2 ); + D3DVIEWPORT8 viewData = { 0,0,640,480, 0.f, 1.f }; + g_pd3dDevice->SetViewport( &viewData0 ); g_pd3dDevice->Clear( 0, NULL, D3DCLEAR_TARGET|D3DCLEAR_ZBUFFER, D3DCOLOR_XRGB(0,0,0), 1.0f, 0x00000000 ); - D3DVIEWPORT8 viewData = { (DWORD)PREFSMAN->m_fScreenPosX, (DWORD)PREFSMAN->m_fScreenPosY, g_CurrentParams.width, g_CurrentParams.height, 0.f, 1.f }; - g_pd3dDevice->SetViewport( &viewData ); #endif // no need to clear because D3D uses an overlay // SetViewport(0,0);