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/BGAnimationLayer.cpp
+4 -4
View File
@@ -155,7 +155,7 @@ void BGAnimationLayer::LoadFromAniLayerFile( const RString& sPath )
Effect effect = EFFECT_CENTER;
for( int i=0; i<NUM_EFFECTS; i++ )
if( lcPath.find(EFFECT_STRING[i]) != string::npos )
if( lcPath.find(EFFECT_STRING[i]) != std::string::npos )
effect = (Effect)i;
switch( effect )
@@ -227,7 +227,7 @@ void BGAnimationLayer::LoadFromAniLayerFile( const RString& sPath )
int iSpriteArea = int( s.GetUnzoomedWidth()*s.GetUnzoomedHeight() );
const int iMaxArea = int(SCREEN_WIDTH*SCREEN_HEIGHT);
int iNumParticles = iMaxArea / iSpriteArea;
iNumParticles = min( iNumParticles, MAX_SPRITES );
iNumParticles = std::min( iNumParticles, MAX_SPRITES );
for( int i=0; i<iNumParticles; i++ )
{
@@ -292,9 +292,9 @@ void BGAnimationLayer::LoadFromAniLayerFile( const RString& sPath )
Sprite s;
s.Load( ID );
m_iNumTilesWide = 2+int(SCREEN_WIDTH /s.GetUnzoomedWidth());
m_iNumTilesWide = min( m_iNumTilesWide, MAX_TILES_WIDE );
m_iNumTilesWide = std::min( m_iNumTilesWide, MAX_TILES_WIDE );
m_iNumTilesHigh = 2+int(SCREEN_HEIGHT/s.GetUnzoomedHeight());
m_iNumTilesHigh = min( m_iNumTilesHigh, MAX_TILES_HIGH );
m_iNumTilesHigh = std::min( m_iNumTilesHigh, MAX_TILES_HIGH );
m_fTilesStartX = s.GetUnzoomedWidth() / 2;
m_fTilesStartY = s.GetUnzoomedHeight() / 2;
m_fTilesSpacingX = s.GetUnzoomedWidth();