Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
@@ -48,11 +48,11 @@ static const char *LightsModeNames[] = {
|
||||
XToString( LightsMode );
|
||||
LuaXType( LightsMode );
|
||||
|
||||
static void GetUsedGameInputs( vector<GameInput> &vGameInputsOut )
|
||||
static void GetUsedGameInputs( std::vector<GameInput> &vGameInputsOut )
|
||||
{
|
||||
vGameInputsOut.clear();
|
||||
|
||||
vector<RString> asGameButtons;
|
||||
std::vector<RString> asGameButtons;
|
||||
split( GAME_BUTTONS_TO_SHOW.GetValue(), ",", asGameButtons );
|
||||
FOREACH_ENUM( GameController, gc )
|
||||
{
|
||||
@@ -67,8 +67,8 @@ static void GetUsedGameInputs( vector<GameInput> &vGameInputsOut )
|
||||
}
|
||||
}
|
||||
|
||||
set<GameInput> vGIs;
|
||||
vector<const Style*> vStyles;
|
||||
std::set<GameInput> vGIs;
|
||||
std::vector<const Style*> vStyles;
|
||||
GAMEMAN->GetStylesForGame( GAMESTATE->m_pCurGame, vStyles );
|
||||
auto const &value = CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue();
|
||||
for (Style const *style : vStyles)
|
||||
@@ -80,7 +80,7 @@ static void GetUsedGameInputs( vector<GameInput> &vGameInputsOut )
|
||||
{
|
||||
for( int iCol=0; iCol < style->m_iColsPerPlayer; ++iCol )
|
||||
{
|
||||
vector<GameInput> gi;
|
||||
std::vector<GameInput> gi;
|
||||
style->StyleInputToGameInput( iCol, pn, gi );
|
||||
for(size_t i= 0; i < gi.size(); ++i)
|
||||
{
|
||||
@@ -150,7 +150,7 @@ void LightsManager::Update( float fDeltaTime )
|
||||
if( fDuration > 0 )
|
||||
{
|
||||
// The light has power left. Brighten it.
|
||||
float fSeconds = min( fDuration, fTime );
|
||||
float fSeconds = std::min( fDuration, fTime );
|
||||
fDuration -= fSeconds;
|
||||
fTime -= fSeconds;
|
||||
fapproach( m_fActorLights[cl], 1, fSeconds / g_fLightEffectRiseSeconds );
|
||||
@@ -404,7 +404,7 @@ void LightsManager::Update( float fDeltaTime )
|
||||
{
|
||||
int index = GetTestAutoCycleCurrentIndex();
|
||||
|
||||
vector<GameInput> vGI;
|
||||
std::vector<GameInput> vGI;
|
||||
GetUsedGameInputs( vGI );
|
||||
wrap( index, vGI.size() );
|
||||
|
||||
@@ -421,7 +421,7 @@ void LightsManager::Update( float fDeltaTime )
|
||||
{
|
||||
ZERO( m_LightsState.m_bGameButtonLights );
|
||||
|
||||
vector<GameInput> vGI;
|
||||
std::vector<GameInput> vGI;
|
||||
GetUsedGameInputs( vGI );
|
||||
|
||||
if( m_iControllerTestManualCycleCurrent != -1 )
|
||||
@@ -487,7 +487,7 @@ void LightsManager::ChangeTestGameButtonLight( int iDir )
|
||||
{
|
||||
m_clTestManualCycleCurrent = CabinetLight_Invalid;
|
||||
|
||||
vector<GameInput> vGI;
|
||||
std::vector<GameInput> vGI;
|
||||
GetUsedGameInputs( vGI );
|
||||
|
||||
m_iControllerTestManualCycleCurrent += iDir;
|
||||
|
||||
Reference in New Issue
Block a user