[default -> loading window] lots of stuff.

This commit is contained in:
Jason Felds
2011-06-05 10:20:53 -04:00
17 changed files with 130 additions and 52 deletions
+1 -1
View File
@@ -948,7 +948,7 @@ MultiPlayer InputMapper::InputDeviceToMultiPlayer( InputDevice id )
GameButton InputScheme::ButtonNameToIndex( const RString &sButtonName ) const
{
for( GameButton gb=(GameButton) 0; gb<m_iButtonsPerController; gb=(GameButton)(gb+1) )
if( sButtonName.EqualsNoCase(GetGameButtonName(gb)) )
if( stricmp(GetGameButtonName(gb), sButtonName) == 0 )
return gb;
return GameButton_Invalid;
+2 -2
View File
@@ -9,8 +9,8 @@
!define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}"
!define PRODUCT_BITMAP "ssc"
!define PRODUCT_URL "http://code.google.com/p/sm-ssc/"
!define UPDATES_URL "http://code.google.com/p/sm-ssc/"
!define PRODUCT_URL "http://www.stepmania.com/"
!define UPDATES_URL "http://www.stepmania.com/"
;!define INSTALL_EXTERNAL_PCKS
;!define INSTALL_INTERNAL_PCKS
+1
View File
@@ -1681,6 +1681,7 @@ void ScreenGameplay::Update( float fDeltaTime )
{
m_pSoundMusic->StopPlaying();
SCREENMAN->PostMessageToTopScreen( SM_NotesEnded, 0 );
// todo: stop lyrics (m_LyricDisplay) from animating -aj
}
// Update living players' alive time
+1 -1
View File
@@ -1458,7 +1458,7 @@ float Song::GetStepsSeconds() const
bool Song::IsLong() const
{
return !IsMarathon() && m_fMusicLengthSeconds > g_fLongVerSongSeconds;
return !IsMarathon() && m_fMusicLengthSeconds >= g_fLongVerSongSeconds;
}
bool Song::IsMarathon() const