actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/ScreenGameplay.h
+17 -17
View File
@@ -93,12 +93,12 @@ public:
* @brief The list of Steps a player has to go through in this set.
*
* The size may be greater than 1 if playing a course. */
vector<Steps*> m_vpStepsQueue;
std::vector<Steps*> m_vpStepsQueue;
/**
* @brief The list of attack modifiers a player has to go through in this set.
*
* The size may be greater than 1 if playing a course. */
vector<AttackArray> m_asModifiersQueue;
std::vector<AttackArray> m_asModifiersQueue;
/** @brief The LifeMeter showing a Player's health. */
LifeMeter *m_pLifeMeter;
@@ -177,8 +177,8 @@ public:
void FailFadeRemovePlayer(PlayerNumber pn);
void BeginBackingOutFromGameplay();
vector<float> m_HasteTurningPoints; // Values at which the meaning of GAMESTATE->m_fHasteRate changes.
vector<float> m_HasteAddAmounts; // Amounts that are added to speed depending on what turning point has been passed.
std::vector<float> m_HasteTurningPoints; // Values at which the meaning of GAMESTATE->m_fHasteRate changes.
std::vector<float> m_HasteAddAmounts; // Amounts that are added to speed depending on what turning point has been passed.
float m_fHasteTimeBetweenUpdates; // Seconds between haste updates.
float m_fHasteLifeSwitchPoint; // Life amount below which GAMESTATE->m_fHasteRate is based on the life amount.
@@ -262,7 +262,7 @@ protected:
* @brief The songs left to play.
*
* The size can be greater than 1 if playing a course. */
vector<Song*> m_apSongsQueue;
std::vector<Song*> m_apSongsQueue;
float m_fTimeSinceLastDancingComment; // this counter is only running while STATE_DANCING
@@ -319,8 +319,8 @@ protected:
/** @brief The NoteData that controls the lights on an arcade cabinet. */
NoteData m_CabinetLightsNoteData;
vector<PlayerInfo> m_vPlayerInfo; // filled by SGameplay derivatives in FillPlayerInfo
virtual void FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut ) = 0;
std::vector<PlayerInfo> m_vPlayerInfo; // filled by SGameplay derivatives in FillPlayerInfo
virtual void FillPlayerInfo( std::vector<PlayerInfo> &vPlayerInfoOut ) = 0;
virtual PlayerInfo &GetPlayerInfoForInput( const InputEventPlus& iep ) { return m_vPlayerInfo[iep.pn]; }
RageTimer m_timerGameplaySeconds;
@@ -331,22 +331,22 @@ protected:
bool m_delaying_ready_announce;
};
vector<PlayerInfo>::iterator GetNextEnabledPlayerInfo ( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v );
vector<PlayerInfo>::iterator GetNextEnabledPlayerInfoNotDummy ( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v );
vector<PlayerInfo>::iterator GetNextEnabledPlayerNumberInfo ( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v );
vector<PlayerInfo>::iterator GetNextPlayerNumberInfo ( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v );
vector<PlayerInfo>::iterator GetNextVisiblePlayerInfo ( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v );
std::vector<PlayerInfo>::iterator GetNextEnabledPlayerInfo ( std::vector<PlayerInfo>::iterator iter, std::vector<PlayerInfo> &v );
std::vector<PlayerInfo>::iterator GetNextEnabledPlayerInfoNotDummy ( std::vector<PlayerInfo>::iterator iter, std::vector<PlayerInfo> &v );
std::vector<PlayerInfo>::iterator GetNextEnabledPlayerNumberInfo ( std::vector<PlayerInfo>::iterator iter, std::vector<PlayerInfo> &v );
std::vector<PlayerInfo>::iterator GetNextPlayerNumberInfo ( std::vector<PlayerInfo>::iterator iter, std::vector<PlayerInfo> &v );
std::vector<PlayerInfo>::iterator GetNextVisiblePlayerInfo ( std::vector<PlayerInfo>::iterator iter, std::vector<PlayerInfo> &v );
/** @brief Get each enabled Player's info. */
#define FOREACH_EnabledPlayerInfo( v, pi ) for( vector<PlayerInfo>::iterator pi = GetNextEnabledPlayerInfo (v.begin(),v); pi != v.end(); pi = GetNextEnabledPlayerInfo(++pi,v) )
#define FOREACH_EnabledPlayerInfo( v, pi ) for( std::vector<PlayerInfo>::iterator pi = GetNextEnabledPlayerInfo (v.begin(),v); pi != v.end(); pi = GetNextEnabledPlayerInfo(++pi,v) )
/** @brief Get each enabled Player's info as long as it's not a dummy player. */
#define FOREACH_EnabledPlayerInfoNotDummy( v, pi ) for( vector<PlayerInfo>::iterator pi = GetNextEnabledPlayerInfoNotDummy (v.begin(),v); pi != v.end(); pi = GetNextEnabledPlayerInfoNotDummy(++pi,v) )
#define FOREACH_EnabledPlayerInfoNotDummy( v, pi ) for( std::vector<PlayerInfo>::iterator pi = GetNextEnabledPlayerInfoNotDummy (v.begin(),v); pi != v.end(); pi = GetNextEnabledPlayerInfoNotDummy(++pi,v) )
/** @brief Get each enabled Player Number's info. */
#define FOREACH_EnabledPlayerNumberInfo( v, pi ) for( vector<PlayerInfo>::iterator pi = GetNextEnabledPlayerNumberInfo (v.begin(),v); pi != v.end(); pi = GetNextEnabledPlayerNumberInfo(++pi,v) )
#define FOREACH_EnabledPlayerNumberInfo( v, pi ) for( std::vector<PlayerInfo>::iterator pi = GetNextEnabledPlayerNumberInfo (v.begin(),v); pi != v.end(); pi = GetNextEnabledPlayerNumberInfo(++pi,v) )
/** @brief Get each Player Number's info, regardless of whether it's enabled or not. */
#define FOREACH_PlayerNumberInfo( v, pi ) for( vector<PlayerInfo>::iterator pi = GetNextPlayerNumberInfo (v.begin(),v); pi != v.end(); pi = GetNextPlayerNumberInfo(++pi,v) )
#define FOREACH_PlayerNumberInfo( v, pi ) for( std::vector<PlayerInfo>::iterator pi = GetNextPlayerNumberInfo (v.begin(),v); pi != v.end(); pi = GetNextPlayerNumberInfo(++pi,v) )
/** @brief Get each visible Player's info. */
#define FOREACH_VisiblePlayerInfo( v, pi ) for( vector<PlayerInfo>::iterator pi = GetNextVisiblePlayerInfo (v.begin(),v); pi != v.end(); pi = GetNextVisiblePlayerInfo(++pi,v) )
#define FOREACH_VisiblePlayerInfo( v, pi ) for( std::vector<PlayerInfo>::iterator pi = GetNextVisiblePlayerInfo (v.begin(),v); pi != v.end(); pi = GetNextVisiblePlayerInfo(++pi,v) )
#endif