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

[tiger -> default] Tiger support is now dead.

Browse Source 
Hmm...why is it mentioning other files on this commit?
This commit is contained in:
Jason Felds
2011-05-30 12:06:39 -04:00
parent f1fa1e279a 9a64fb230b
commit 98990d90ef
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Xcode/stepmania.xcodeproj/project.pbxproj
+4
View File
@@ -8006,6 +8006,7 @@
LUA_USE_MACOSX, LUA_USE_MACOSX,
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_PROTOTYPE_CONVERSION = NO;
GCC_WARN_SHADOW = NO; GCC_WARN_SHADOW = NO;
@@ -8361,6 +8362,7 @@
LUA_USE_MACOSX, LUA_USE_MACOSX,
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_PROTOTYPE_CONVERSION = NO;
GCC_WARN_SHADOW = NO; GCC_WARN_SHADOW = NO;
@@ -8385,6 +8387,7 @@
LUA_USE_MACOSX, LUA_USE_MACOSX,
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_PROTOTYPE_CONVERSION = NO;
GCC_WARN_SHADOW = NO; GCC_WARN_SHADOW = NO;
@@ -8409,6 +8412,7 @@
LUA_USE_MACOSX, LUA_USE_MACOSX,
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_PROTOTYPE_CONVERSION = NO;
GCC_WARN_SHADOW = NO; GCC_WARN_SHADOW = NO;
src/GameplayAssist.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ void GameplayAssist::PlayTicks( const NoteData &nd, const PlayerState *ps )
if( nd.IsThereATapOrHoldHeadAtRow( r ) ) if( nd.IsThereATapOrHoldHeadAtRow( r ) )
iClapRow = r; iClapRow = r;
if( iClapRow != -1 ) if( iClapRow != -1 && !timing.IsWarpAtRow( iClapRow ) && !timing.IsFakeAtRow( iClapRow ) )
{ {
const float fTickBeat = NoteRowToBeat( iClapRow ); const float fTickBeat = NoteRowToBeat( iClapRow );
const float fTickSecond = timing.GetElapsedTimeFromBeatNoOffset( fTickBeat ); const float fTickSecond = timing.GetElapsedTimeFromBeatNoOffset( fTickBeat );
src/NotesLoaderSMA.cpp
+11 -4
View File
@@ -319,9 +319,12 @@ void SMALoader::ProcessSpeeds( TimingData &out, const int iRowsPerBeat, const RS
FOREACH_CONST( RString, vs1, s1 ) FOREACH_CONST( RString, vs1, s1 )
{ {
vector<RString> vs2; vector<RString> vs2;
split( *s1, "=", vs2 ); vs2.clear(); // trying something.
RString loopTmp = *s1;
Trim( loopTmp );
split( loopTmp, "=", vs2 );
if( RowToBeat(vs2[0], iRowsPerBeat) == 0 && vs2.size() == 2 ) // First one always seems to have 2. if( vs2.size() == 2 ) // First one always seems to have 2.
{ {
vs2.push_back("0"); vs2.push_back("0");
} }
@@ -656,12 +659,16 @@ bool SMALoader::LoadFromSMAFile( const RString &sPath, Song &out )
{ {
TimingData &timing = (state == SMA_GETTING_STEP_INFO TimingData &timing = (state == SMA_GETTING_STEP_INFO
? pNewNotes->m_Timing : out.m_SongTiming); ? pNewNotes->m_Timing : out.m_SongTiming);
ProcessSpeeds( timing, iRowsPerBeat, sParams[1] ); RString tmp = sParams[1];
Trim( tmp );
ProcessSpeeds( timing, iRowsPerBeat, tmp );
} }
else if( sValueName=="MULTIPLIER" ) else if( sValueName=="MULTIPLIER" )
{ {
ProcessMultipliers( pNewNotes->m_Timing, iRowsPerBeat, sParams[1] ); TimingData &timing = (state == SMA_GETTING_STEP_INFO
? pNewNotes->m_Timing : out.m_SongTiming);
ProcessMultipliers( timing, iRowsPerBeat, sParams[1] );
} }
else if( sValueName=="FAKES" ) else if( sValueName=="FAKES" )