diff --git a/src/Attack.h b/src/Attack.h index 8ce4b7942c..30f87589cf 100644 --- a/src/Attack.h +++ b/src/Attack.h @@ -32,7 +32,10 @@ struct Attack bGlobal = false; bShowInAttackList = true; } - Attack() { MakeBlank(); } + Attack(): level(ATTACK_LEVEL_1), fStartSecond(-1), + fSecsRemaining(0), sModifiers(RString()), + bOn(false), bGlobal(false), bShowInAttackList(true) + {} // MakeBlank() is effectively called here. Attack( AttackLevel level_, float fStartSecond_, @@ -40,16 +43,11 @@ struct Attack RString sModifiers_, bool bOn_, bool bGlobal_, - bool bShowInAttackList_ = true ) - { - level = level_; - fStartSecond = fStartSecond_; - fSecsRemaining = fSecsRemaining_; - sModifiers = sModifiers_; - bOn = bOn_; - bGlobal = bGlobal_; - bShowInAttackList = bShowInAttackList_; - } + bool bShowInAttackList_ = true ): + level(level_), fStartSecond(fStartSecond_), + fSecsRemaining(fSecsRemaining_), sModifiers(sModifiers_), + bOn(bOn_), bGlobal(bGlobal_), + bShowInAttackList(bShowInAttackList_) {} void GetAttackBeats( const Song *pSong, float &fStartBeat, float &fEndBeat ) const; void GetRealtimeAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const; diff --git a/src/ModelTypes.h b/src/ModelTypes.h index 9ede50dd02..d2943e565c 100644 --- a/src/ModelTypes.h +++ b/src/ModelTypes.h @@ -66,12 +66,9 @@ private: RageTexture* pTexture_, float fDelaySecs_, RageVector2 vTranslate_ - ) - { - pTexture = pTexture_; - fDelaySecs = fDelaySecs_; - vTranslate = vTranslate_; - } + ): + pTexture(pTexture_), fDelaySecs(fDelaySecs_), + vTranslate(vTranslate_) {} RageTexture* pTexture; float fDelaySecs; diff --git a/src/RageSurface.h b/src/RageSurface.h index e6eb8fa92b..73c873133c 100644 --- a/src/RageSurface.h +++ b/src/RageSurface.h @@ -7,7 +7,7 @@ struct RageSurfaceColor { uint8_t r, g, b, a; - RageSurfaceColor() { } + RageSurfaceColor(): r(0), g(0), b(0), a(0) { } RageSurfaceColor( uint8_t r_, uint8_t g_, uint8_t b_, uint8_t a_ ): r(r_), g(g_), b(b_), a(a_) { } diff --git a/src/RageTextureID.h b/src/RageTextureID.h index 4d3b1c43ed..0825b7e626 100644 --- a/src/RageTextureID.h +++ b/src/RageTextureID.h @@ -59,8 +59,15 @@ struct RageTextureID void Init(); - RageTextureID() { Init(); } - RageTextureID( const RString &fn ) { Init(); SetFilename(fn); } + RageTextureID(): filename(RString()), iMaxSize(0), bMipMaps(false), + iAlphaBits(0), iGrayscaleBits(0), iColorDepth(0), + bDither(false), bStretch(false), bHotPinkColorKey(false), + AdditionalTextureHints(RString()), Policy(TEX_DEFAULT) { Init(); } + RageTextureID( const RString &fn ): filename(RString()), iMaxSize(0), + bMipMaps(false), iAlphaBits(0), iGrayscaleBits(0), + iColorDepth(0), bDither(false), bStretch(false), + bHotPinkColorKey(false), AdditionalTextureHints(RString()), + Policy(TEX_DEFAULT) { Init(); SetFilename(fn); } void SetFilename( const RString &fn ); }; diff --git a/src/RageTextureManager.h b/src/RageTextureManager.h index 06c0f525ec..33ab3e81bc 100644 --- a/src/RageTextureManager.h +++ b/src/RageTextureManager.h @@ -14,30 +14,23 @@ struct RageTextureManagerPrefs bool m_bHighResolutionTextures; bool m_bMipMaps; - RageTextureManagerPrefs() - { - m_bDelayedDelete = false; - m_iMovieColorDepth = 16; - m_iTextureColorDepth = 16; - m_iMaxTextureResolution = 1024; - m_bHighResolutionTextures = true; - m_bMipMaps = false; - } + RageTextureManagerPrefs(): m_iTextureColorDepth(16), + m_iMovieColorDepth(16), m_bDelayedDelete(false), + m_iMaxTextureResolution(1024), + m_bHighResolutionTextures(true), m_bMipMaps(false) {} RageTextureManagerPrefs( int iTextureColorDepth, int iMovieColorDepth, bool bDelayedDelete, int iMaxTextureResolution, bool bHighResolutionTextures, - bool bMipMaps ) - { - m_bDelayedDelete = bDelayedDelete; - m_iMovieColorDepth = iMovieColorDepth; - m_iTextureColorDepth = iTextureColorDepth; - m_iMaxTextureResolution = iMaxTextureResolution; - m_bHighResolutionTextures = bHighResolutionTextures; - m_bMipMaps = bMipMaps; - } + bool bMipMaps ): + m_iTextureColorDepth(iTextureColorDepth), + m_iMovieColorDepth(iMovieColorDepth), + m_bDelayedDelete(bDelayedDelete), + m_iMaxTextureResolution(iMaxTextureResolution), + m_bHighResolutionTextures(bHighResolutionTextures), + m_bMipMaps(bMipMaps) {} bool operator!=( const RageTextureManagerPrefs& rhs ) const { diff --git a/src/RageTypes.h b/src/RageTypes.h index 9f86c6eb7a..5c328908b6 100644 --- a/src/RageTypes.h +++ b/src/RageTypes.h @@ -290,8 +290,8 @@ class RageVColor public: uint8_t b,g,r,a; // specific ordering required by Direct3D - RageVColor() { } - RageVColor(const RageColor &rc) { *this = rc; } + RageVColor(): b(0), g(0), r(0), a(0) { } + RageVColor(const RageColor &rc): b(0), g(0), r(0), a(0) { *this = rc; } RageVColor &operator= (const RageColor &rc) { r = FTOC(rc.r); g = FTOC(rc.g); b = FTOC(rc.b); a = FTOC(rc.a); diff --git a/src/RageUtil.cpp b/src/RageUtil.cpp index 2433a8335f..257a7925d0 100644 --- a/src/RageUtil.cpp +++ b/src/RageUtil.cpp @@ -17,7 +17,7 @@ RandomGen g_RandomNumberGenerator; -MersenneTwister::MersenneTwister( int iSeed ) +MersenneTwister::MersenneTwister( int iSeed ) : m_iNext(0) { Reset( iSeed ); } @@ -1315,15 +1315,13 @@ void Regex::Release() m_sPattern = RString(); } -Regex::Regex( const RString &sStr ) +Regex::Regex( const RString &sStr ): m_pReg(NULL), m_iBackrefs(0), m_sPattern(RString()) { - m_pReg = NULL; Set( sStr ); } -Regex::Regex( const Regex &rhs ) +Regex::Regex( const Regex &rhs ): m_pReg(NULL), m_iBackrefs(0), m_sPattern(RString()) { - m_pReg = NULL; Set( rhs.m_sPattern ); }