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

Just a few minor bugfixes. Game Switching re-enabled.

Browse Source
This commit is contained in:
Andrew Livy
2002-07-05 22:10:00 +00:00
parent b79affe965
commit 9c67370e12
3 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+1 -1
View File
@@ -290,7 +290,7 @@ void ScreenGameplay::SaveSummary()
} }
m_pCurSong = NULL; m_pCurSong = NULL;
for( int p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
m_pCurNotes[p] = NULL; m_pCurNotes[p] = NULL;
} }
} }
stepmania/src/ScreenTitleMenu.cpp
+17 -4
View File
@@ -128,8 +128,22 @@ ScreenTitleMenu::ScreenTitleMenu()
m_Fade.SetClosed(); m_Fade.SetClosed();
m_Fade.OpenWipingRight( SM_DoneOpening ); m_Fade.OpenWipingRight( SM_DoneOpening );
this->AddActor( &m_Fade ); this->AddActor( &m_Fade );
// LEAVE THIS HERE! ITS ESSENTIAL
// I know you're a fan of removing my code, but if this isn't here
// the Ez2dancer announcer will be the default (as it loads in alphabetical order, and ez2dancer
// is the last announcer (E follows D))
// so just leave it yeah?
// I don't wanna fix this a 3rd TIME!!
// - Andy.
if (GAMEMAN->m_CurGame != GAME_EZ2)
{
ANNOUNCER->SwitchAnnouncer( "default" );
}
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_TITLE_MENU_GAME_NAME) ); SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_TITLE_MENU_GAME_NAME) );
m_soundChange.Load( THEME->GetPathTo(SOUND_TITLE_MENU_CHANGE) ); m_soundChange.Load( THEME->GetPathTo(SOUND_TITLE_MENU_CHANGE) );
@@ -143,7 +157,6 @@ ScreenTitleMenu::ScreenTitleMenu()
m_TitleMenuChoice = CHOICE_GAME_START; m_TitleMenuChoice = CHOICE_GAME_START;
GainFocus( m_TitleMenuChoice ); GainFocus( m_TitleMenuChoice );
MUSIC->Stop(); MUSIC->Stop();
//this->SendScreenMessage( SM_TimeToFadeOut, 30.0 ); //this->SendScreenMessage( SM_TimeToFadeOut, 30.0 );
@@ -269,9 +282,9 @@ void ScreenTitleMenu::MenuStart( const PlayerNumber p )
} }
return; return;
case CHOICE_SELECT_GAME: case CHOICE_SELECT_GAME:
m_soundInvalid.PlayRandom(); // m_soundInvalid.PlayRandom();
// m_soundSelect.PlayRandom(); m_soundSelect.PlayRandom();
// m_Fade.CloseWipingRight( SM_GoToSelectGame ); m_Fade.CloseWipingRight( SM_GoToSelectGame );
return; return;
case CHOICE_MAP_INSTRUMENTS: case CHOICE_MAP_INSTRUMENTS:
m_soundSelect.PlayRandom(); m_soundSelect.PlayRandom();
stepmania/src/ThemeManager.cpp
+14
View File
@@ -263,6 +263,13 @@ CString ThemeManager::GetPathTo( ThemeElement te )
GetDirListing( sCurrentThemeDir + sAssetPrefix + "*.jpg", asPossibleElementFilePaths, false, true ); GetDirListing( sCurrentThemeDir + sAssetPrefix + "*.jpg", asPossibleElementFilePaths, false, true );
GetDirListing( sCurrentThemeDir + sAssetPrefix + "*.bmp", asPossibleElementFilePaths, false, true ); GetDirListing( sCurrentThemeDir + sAssetPrefix + "*.bmp", asPossibleElementFilePaths, false, true );
GetDirListing( sCurrentThemeDir + sAssetPrefix + "*.gif", asPossibleElementFilePaths, false, true ); GetDirListing( sCurrentThemeDir + sAssetPrefix + "*.gif", asPossibleElementFilePaths, false, true );
// WHY Get rid of this when it's used?
// Just commment out if you REALLY don't want it?
GetDirListing( sDefaultThemeDir + sAssetPrefix + "*.sprite", asPossibleElementFilePaths, false, true );
GetDirListing( sDefaultThemeDir + sAssetPrefix + "*.png", asPossibleElementFilePaths, false, true );
GetDirListing( sDefaultThemeDir + sAssetPrefix + "*.jpg", asPossibleElementFilePaths, false, true );
GetDirListing( sDefaultThemeDir + sAssetPrefix + "*.bmp", asPossibleElementFilePaths, false, true );
} }
else if( -1 != sAssetPrefix.Find("Sounds\\") ) else if( -1 != sAssetPrefix.Find("Sounds\\") )
{ {
@@ -270,10 +277,17 @@ CString ThemeManager::GetPathTo( ThemeElement te )
GetDirListing( sCurrentThemeDir + sAssetPrefix + ".mp3", asPossibleElementFilePaths, false, true ); GetDirListing( sCurrentThemeDir + sAssetPrefix + ".mp3", asPossibleElementFilePaths, false, true );
GetDirListing( sCurrentThemeDir + sAssetPrefix + ".ogg", asPossibleElementFilePaths, false, true ); GetDirListing( sCurrentThemeDir + sAssetPrefix + ".ogg", asPossibleElementFilePaths, false, true );
GetDirListing( sCurrentThemeDir + sAssetPrefix + ".wav", asPossibleElementFilePaths, false, true ); GetDirListing( sCurrentThemeDir + sAssetPrefix + ".wav", asPossibleElementFilePaths, false, true );
GetDirListing( sDefaultThemeDir + sAssetPrefix + ".set", asPossibleElementFilePaths, false, true );
GetDirListing( sDefaultThemeDir + sAssetPrefix + ".mp3", asPossibleElementFilePaths, false, true );
GetDirListing( sDefaultThemeDir + sAssetPrefix + ".ogg", asPossibleElementFilePaths, false, true );
GetDirListing( sDefaultThemeDir + sAssetPrefix + ".wav", asPossibleElementFilePaths, false, true );
} }
else if( -1 != sAssetPrefix.Find("Fonts\\") ) else if( -1 != sAssetPrefix.Find("Fonts\\") )
{ {
GetDirListing( sCurrentThemeDir + sAssetPrefix + ".font", asPossibleElementFilePaths, false, true ); GetDirListing( sCurrentThemeDir + sAssetPrefix + ".font", asPossibleElementFilePaths, false, true );
GetDirListing( sDefaultThemeDir + sAssetPrefix + ".font", asPossibleElementFilePaths, false, true );
} }
else else
{ {