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

Noteskin name in PlayerOptions needs to be compared case-insensitive when comparing PlayerOptions structures. The old code that used != probably relied on RString::operator!= misbehaving.

Browse Source
This commit is contained in:
Kyzentun Keeslala
2015-11-05 21:56:43 -07:00
parent cbb76cf22f
commit d496f8145c
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/OptionRowHandler.cpp
+1 -1
View File
@@ -203,7 +203,7 @@ public:
}
else
{
LuaHelpers::ReportScriptErrorFmt("Unknown row flag \"%s\".", sName.c_str());
LuaHelpers::ReportScriptErrorFmt("Unknown row flag \"%s\" on row %s.", sName.c_str(), m_Def.m_sName.c_str());
}
}
for( int col = 0; col < NumCols; ++col )
src/PlayerOptions.cpp
+16 -3
View File
@@ -524,10 +524,16 @@ bool PlayerOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut
else if( sBit == "space" ) { m_fSkew = level; m_fPerspectiveTilt = +level; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; }
else if( sBit == "hallway" ) { m_fSkew = 0; m_fPerspectiveTilt = -level; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; }
else if( sBit == "distant" ) { m_fSkew = 0; m_fPerspectiveTilt = +level; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; }
else if( NOTESKIN && NOTESKIN->DoesNoteSkinExist(sBit) ) m_sNoteSkin = sBit;
else if( NOTESKIN && NOTESKIN->DoesNoteSkinExist(sBit) )
{
m_sNoteSkin = sBit;
}
else if( sBit == "skew" ) SET_FLOAT( fSkew )
else if( sBit == "tilt" ) SET_FLOAT( fPerspectiveTilt )
else if( sBit == "noteskin" && !on ) /* "no noteskin" */ m_sNoteSkin = CommonMetrics::DEFAULT_NOTESKIN_NAME;
else if( sBit == "noteskin" && !on ) /* "no noteskin" */
{
m_sNoteSkin = CommonMetrics::DEFAULT_NOTESKIN_NAME;
}
else if( sBit == "randomspeed" ) SET_FLOAT( fRandomSpeed )
else if( sBit == "failarcade" ||
sBit == "failimmediate" ) m_FailType = FailType_Immediate;
@@ -769,7 +775,14 @@ bool PlayerOptions::operator==( const PlayerOptions &other ) const
COMPARE(m_fPlayerAutoPlay);
COMPARE(m_fPerspectiveTilt);
COMPARE(m_fSkew);
COMPARE(m_sNoteSkin);
// The noteskin name needs to be compared case-insensitively because the
// manager forces lowercase, but some obscure part of PlayerOptions
// uppercases the first letter. The previous code that used != probably
// relied on RString::operator!= misbehaving. -Kyz
if(strcasecmp(m_sNoteSkin, other.m_sNoteSkin) != 0)
{
return false;
}
for( int i = 0; i < PlayerOptions::NUM_ACCELS; ++i )
COMPARE(m_fAccels[i]);
for( int i = 0; i < PlayerOptions::NUM_EFFECTS; ++i )