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

Fixed "can't switch to windowed" (hopefully). Fixed smpackage: individual files selected not added to zip.

Browse Source
This commit is contained in:
Chris Danford
2002-10-20 02:33:32 +00:00
parent 28ca40b186
commit d7e458cb2f
3 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -614,7 +614,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
{ {
case GRADE_AA: case GRADE_AA:
case GRADE_AAA: case GRADE_AAA:
this->SendScreenMessage( SM_PlayCheer, 3 ); this->SendScreenMessage( SM_PlayCheer, 2.5f );
break; break;
} }
stepmania/src/StepMania.cpp
+41 -7
View File
@@ -968,7 +968,7 @@ void ApplyGraphicOptions()
); );
// //
// If the requested resolution doesn't work, keep switching until we find one that does. // If the requested modes doesn't work, keep switching until we find one that does.
// //
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) ) if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success; goto success;
@@ -978,6 +978,16 @@ void ApplyGraphicOptions()
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) ) if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success; goto success;
LOG->Trace( "Failed again. Try 16 BPP." );
iDisplayBPP = 16;
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success;
LOG->Trace( "Failed again. Try 32 BPP." );
iDisplayBPP = 32;
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success;
LOG->Trace( "We failed. Try full screen with same params." ); LOG->Trace( "We failed. Try full screen with same params." );
bWindowed = false; bWindowed = false;
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) ) if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
@@ -998,6 +1008,27 @@ void ApplyGraphicOptions()
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) ) if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success; goto success;
LOG->Trace( "Failed again. Try 32 BPP." );
iDisplayBPP = 32;
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success;
LOG->Trace( "Failed again. Try 16 BPP." );
iDisplayBPP = 16;
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success;
LOG->Trace( "Failed again. Try 640x480." );
iDisplayWidth = 640;
iDisplayHeight = 480;
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success;
LOG->Trace( "We failed. Try full screen with same params." );
bWindowed = false;
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success;
LOG->Trace( "Failed again. Try 16 BPP." ); LOG->Trace( "Failed again. Try 16 BPP." );
iDisplayBPP = 16; iDisplayBPP = 16;
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) ) if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
@@ -1008,15 +1039,18 @@ void ApplyGraphicOptions()
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) ) if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success; goto success;
LOG->Trace( "Failed again. Try 640x480." ); LOG->Trace( "We failed. Try windowed with same params." );
iDisplayWidth = 640; bWindowed = false;
iDisplayHeight = 480;
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) ) if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success; goto success;
LOG->Trace( "Failed again. Try 320x240." ); LOG->Trace( "Failed again. Try 32 BPP." );
iDisplayWidth = 320; iDisplayBPP = 32;
iDisplayHeight = 240; if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success;
LOG->Trace( "Failed again. Try 16 BPP." );
iDisplayBPP = 16;
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) ) if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate, PREFSMAN->m_bVsync ) )
goto success; goto success;
stepmania/src/smpackage/smpackageDlg.cpp
+1
View File
@@ -264,6 +264,7 @@ bool ExportPackage( CString sPackageName, const CStringArray& asDirectoriesToExp
for( int i=0; i<asDirectoriesToExport.GetSize(); i++ ) for( int i=0; i<asDirectoriesToExport.GetSize(); i++ )
{ {
CStringArray asFilePaths; CStringArray asFilePaths;
asFilePaths.Add( asDirectoriesToExport[i] );
GetFilePathsInDirectory( asDirectoriesToExport[i], asFilePaths ); GetFilePathsInDirectory( asDirectoriesToExport[i], asFilePaths );
for( int j=0; j<asFilePaths.GetSize(); j++ ) for( int j=0; j<asFilePaths.GetSize(); j++ )