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

[PlayerOptions] Fix a problem with m-mods where you would get m200 as the default speed modifier.

Browse Source
This commit is contained in:
AJ Kelly
2012-01-15 23:39:53 -06:00
parent 0f25c7f3ba
commit 3fdfc1c4d4
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm5.txt
+3 -1
View File
@@ -5,12 +5,14 @@ from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
________________________________________________________________________________ ________________________________________________________________________________
================================================================================ ================================================================================
StepMania 5.0 alpha ? | 20120??? StepMania 5.0 alpha 1a | 201201??
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
2012/01/15 2012/01/15
---------- ----------
* [WheelNotifyIcon] Add the NumIconsToShow metric. [Wolfman2000] * [WheelNotifyIcon] Add the NumIconsToShow metric. [Wolfman2000]
* [PlayerOptions] Fix a problem with m-mods where you would get m200 as
the default speed modifier. [AJ]
2012/01/11 2012/01/11
---------- ----------
src/PlayerOptions.cpp
+4 -1
View File
@@ -61,7 +61,7 @@ void PlayerOptions::Approach( const PlayerOptions& other, float fDeltaSeconds )
APPROACH( fTimeSpacing ); APPROACH( fTimeSpacing );
APPROACH( fScrollSpeed ); APPROACH( fScrollSpeed );
//APPROACH( fMaxScrollBPM ); APPROACH( fMaxScrollBPM );
fapproach( m_fScrollBPM, other.m_fScrollBPM, fDeltaSeconds * other.m_SpeedfScrollBPM*150 ); fapproach( m_fScrollBPM, other.m_fScrollBPM, fDeltaSeconds * other.m_SpeedfScrollBPM*150 );
for( int i=0; i<NUM_ACCELS; i++ ) for( int i=0; i<NUM_ACCELS; i++ )
APPROACH( fAccels[i] ); APPROACH( fAccels[i] );
@@ -355,8 +355,11 @@ bool PlayerOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut
// XXX: will not properly tween, I don't think. // XXX: will not properly tween, I don't think.
else if( sscanf( sBit, "m%f", &level ) == 1 ) else if( sscanf( sBit, "m%f", &level ) == 1 )
{ {
// OpenITG doesn't have this block:
/*
if( !isfinite(level) || level <= 0.0f ) if( !isfinite(level) || level <= 0.0f )
level = 200.0f; level = 200.0f;
*/
SET_FLOAT( fMaxScrollBPM ) SET_FLOAT( fMaxScrollBPM )
m_fTimeSpacing = 0; m_fTimeSpacing = 0;
} }