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

Reverted a change, and put the IFDEF a little higher for testing purposes.

Browse Source
This commit is contained in:
Renaud Lepage
2006-01-24 00:21:11 +00:00
parent 1962f03286
commit 11af21d11b
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay.cpp
-3
View File
@@ -59,9 +59,6 @@ RString RageDisplay::SetVideoMode( VideoModeParams p, bool &bNeedReloadTextures
LOG->Trace( "TryVideoMode failed: %s", err.c_str() ); LOG->Trace( "TryVideoMode failed: %s", err.c_str() );
// fall back // fall back
#if !defined(_XBOX)
p.windowed = true;
#endif
if( this->TryVideoMode(p,bNeedReloadTextures) == "" ) if( this->TryVideoMode(p,bNeedReloadTextures) == "" )
return RString(); return RString();
p.bpp = 16; p.bpp = 16;
stepmania/src/RageDisplay_D3D.cpp
+5 -5
View File
@@ -552,15 +552,15 @@ static void SetPresentParametersFromVideoModeParams( const VideoModeParams &p, D
RString RageDisplay_D3D::TryVideoMode( const VideoModeParams &_p, bool &bNewDeviceOut ) RString RageDisplay_D3D::TryVideoMode( const VideoModeParams &_p, bool &bNewDeviceOut )
{ {
VideoModeParams p = _p; VideoModeParams p = _p;
#if defined(XBOX)
//LOG->Warn( "RageDisplay_D3D::TryVideoMode( %d, %d, %d, %d, %d, %d )", p.windowed, p.width, p.height, p.bpp, p.rate, p.vsync ); p.windowed = false;
#endif
LOG->Warn( "RageDisplay_D3D::TryVideoMode( %d, %d, %d, %d, %d, %d )", p.windowed, p.width, p.height, p.bpp, p.rate, p.vsync );
if( FindBackBufferType( p.windowed, p.bpp ) == D3DFMT_UNKNOWN ) // no possible back buffer formats if( FindBackBufferType( p.windowed, p.bpp ) == D3DFMT_UNKNOWN ) // no possible back buffer formats
return ssprintf( "FindBackBufferType(%i,%i) failed", p.windowed, p.bpp ); // failed to set mode return ssprintf( "FindBackBufferType(%i,%i) failed", p.windowed, p.bpp ); // failed to set mode
#if defined(XBOX)
p.windowed = false;
#endif
/* Set up and display the window before setting up D3D. If we don't do this, /* Set up and display the window before setting up D3D. If we don't do this,
* then setting up a fullscreen window (when we're not coming from windowed) * then setting up a fullscreen window (when we're not coming from windowed)