diff --git a/src/DancingCharacters.cpp b/src/DancingCharacters.cpp index 3404096a63..6653173f9b 100644 --- a/src/DancingCharacters.cpp +++ b/src/DancingCharacters.cpp @@ -43,10 +43,11 @@ const float MODEL_X_ONE_PLAYER = 0; const float MODEL_X_TWO_PLAYERS[NUM_PLAYERS] = { +8, -8 }; const float MODEL_ROTATIONY_TWO_PLAYERS[NUM_PLAYERS] = { -90, 90 }; -DancingCharacters::DancingCharacters() +DancingCharacters::DancingCharacters(): m_bDrawDangerLight(false), + m_CameraDistance(0), m_CameraPanYStart(0), m_CameraPanYEnd(0), + m_fLookAtHeight(0), m_fCameraHeightStart(0), m_fCameraHeightEnd(0), + m_fThisCameraStartBeat(0), m_fThisCameraEndBeat(0) { - m_bDrawDangerLight = false; - FOREACH_PlayerNumber( p ) { m_pCharacter[p] = new Model; diff --git a/src/HighScore.h b/src/HighScore.h index 61610bb88f..c3f9b0f94c 100644 --- a/src/HighScore.h +++ b/src/HighScore.h @@ -100,9 +100,13 @@ private: struct HighScoreList { public: - HighScoreList() + /** + * @brief Set up the HighScore List with default values. + * + * This used to call Init(), but it's better to be explicit here. */ + HighScoreList(): HighGrade(Grade_NoData), iNumTimesPlayed(0) { - Init(); + vHighScores.clear(); } void Init(); diff --git a/src/Model.h b/src/Model.h index 804d9a38ee..d9ce8e343b 100644 --- a/src/Model.h +++ b/src/Model.h @@ -83,6 +83,8 @@ private: float m_fCurAnimationRate; bool m_bLoop; bool m_bDrawCelShaded; // for Lua models + + Model& operator=(const Model& rhs); }; #endif diff --git a/src/StageStats.h b/src/StageStats.h index a160d0c652..a5a52587ef 100644 --- a/src/StageStats.h +++ b/src/StageStats.h @@ -79,6 +79,9 @@ public: // Lua void PushSelf( lua_State *L ); + +private: + // TODO: Implement the copy and assignment operators on our own. }; #endif