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

Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements

Browse Source 
Fix whitespace changes
This commit is contained in:
Michael Sundqvist
2022-07-31 22:14:38 +02:00
committed by Martin Natano
parent f0680a29fc
commit 0cba3579de
534 changed files with 3456 additions and 3488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AutoKeysounds.cpp
+6 -6
View File
@@ -67,7 +67,7 @@ void AutoKeysounds::LoadAutoplaySoundsInto( RageSoundReader_Chain *pChain )
* This leads to failure later on.
* We need a better way to prevent this. */
if( m_ndAutoKeysoundsOnly[pn].GetNextTapNoteRowForTrack( t, iNextRowForPlayer ) )
iNextRow = min( iNextRow, iNextRowForPlayer );
iNextRow = std::min( iNextRow, iNextRowForPlayer );
}
if( iNextRow == INT_MAX )
@@ -111,7 +111,7 @@ void AutoKeysounds::LoadTracks( const Song *pSong, RageSoundReader *&pShared, Ra
pPlayer2 = nullptr;
pShared = nullptr;
vector<RString> vsMusicFile;
std::vector<RString> vsMusicFile;
const RString sMusicPath = GAMESTATE->m_pCurSteps[GAMESTATE->GetMasterPlayerNumber()]->GetMusicPath();
if( !sMusicPath.empty() )
@@ -126,7 +126,7 @@ void AutoKeysounds::LoadTracks( const Song *pSong, RageSoundReader *&pShared, Ra
}
vector<RageSoundReader *> vpSounds;
std::vector<RageSoundReader *> vpSounds;
for (RString const &s : vsMusicFile)
{
RString sError;
@@ -239,7 +239,7 @@ void AutoKeysounds::FinishLoading()
Song* pSong = GAMESTATE->m_pCurSong;
vector<RageSoundReader *> apSounds;
std::vector<RageSoundReader *> apSounds;
LoadTracks( pSong, m_pSharedSound, m_pPlayerSounds[0], m_pPlayerSounds[1] );
// Load autoplay sounds, if any.
@@ -287,7 +287,7 @@ void AutoKeysounds::FinishLoading()
}
if( GAMESTATE->GetNumPlayersEnabled() == 1 && GAMESTATE->GetMasterPlayerNumber() == PLAYER_2 )
swap( m_pPlayerSounds[PLAYER_1], m_pPlayerSounds[PLAYER_2] );
std::swap( m_pPlayerSounds[PLAYER_1], m_pPlayerSounds[PLAYER_2] );
if( apSounds.size() > 1 )
{
@@ -319,7 +319,7 @@ void AutoKeysounds::Update( float fDelta )
float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds );
int iRowNow = BeatToNoteRowNotRounded( fSongBeat );
iRowNow = max( 0, iRowNow );
iRowNow = std::max( 0, iRowNow );
static int iRowLastCrossed = 0;
float fBeatLast = roundf(NoteRowToBeat(iRowLastCrossed));