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

merge

Browse Source
This commit is contained in:
Thai Pangsakulyanont
2012-04-24 00:15:02 +07:00
parent f9b0998ced 11637bd603
commit 15315ced5e
5 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BackgroundUtil.cpp
+1 -1
View File
@@ -243,7 +243,7 @@ static void GetFilterToFileNames( const RString sBaseDir, const Song *pSong, set
bool bSuccess = ini.GetValue( "GenreToSection", pSong->m_sGenre, sSection );
if( !bSuccess )
{
LOG->Warn( "Genre '%s' isn't mapped", pSong->m_sGenre.c_str() );
//LOG->Warn( "Genre '%s' isn't mapped", pSong->m_sGenre.c_str() );
return;
}
src/LifeMeterBar.cpp
+1 -1
View File
@@ -191,7 +191,7 @@ void LifeMeterBar::ChangeLife( float fDeltaLife )
{
bool bUseMercifulDrain = m_bMercifulBeginnerInEffect || PREFSMAN->m_bMercifulDrain;
if( bUseMercifulDrain && fDeltaLife < 0 )
fDeltaLife *= 0.4f;
fDeltaLife *= SCALE( m_fLifePercentage, 0.f, 1.f, 0.5f, 1.f);
// handle progressiveness and ComboToRegainLife here
if( fDeltaLife >= 0 )