Convert to the new arrays.
This commit is contained in:
+14
-12
@@ -6,6 +6,7 @@
|
|||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
#include "RageTimer.h"
|
#include "RageTimer.h"
|
||||||
#include "AutoActor.h"
|
#include "AutoActor.h"
|
||||||
|
#include <array>
|
||||||
class Model;
|
class Model;
|
||||||
|
|
||||||
/** @brief The different animation states for the dancer. */
|
/** @brief The different animation states for the dancer. */
|
||||||
@@ -38,7 +39,7 @@ public:
|
|||||||
void Change2DAnimState( PlayerNumber pn, int iState );
|
void Change2DAnimState( PlayerNumber pn, int iState );
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
Model *m_pCharacter[NUM_PLAYERS];
|
std::array<Model *, NUM_PLAYERS> m_pCharacter;
|
||||||
|
|
||||||
/** @brief How far away is the camera from the dancer? */
|
/** @brief How far away is the camera from the dancer? */
|
||||||
float m_CameraDistance;
|
float m_CameraDistance;
|
||||||
@@ -50,19 +51,20 @@ protected:
|
|||||||
float m_fThisCameraStartBeat;
|
float m_fThisCameraStartBeat;
|
||||||
float m_fThisCameraEndBeat;
|
float m_fThisCameraEndBeat;
|
||||||
|
|
||||||
bool m_bHas2DElements[NUM_PLAYERS];
|
std::array<bool, NUM_PLAYERS> m_bHas2DElements;
|
||||||
|
|
||||||
AutoActor m_bgIdle[NUM_PLAYERS];
|
|
||||||
AutoActor m_bgMiss[NUM_PLAYERS];
|
|
||||||
AutoActor m_bgGood[NUM_PLAYERS];
|
|
||||||
AutoActor m_bgGreat[NUM_PLAYERS];
|
|
||||||
AutoActor m_bgFever[NUM_PLAYERS];
|
|
||||||
AutoActor m_bgFail[NUM_PLAYERS];
|
|
||||||
AutoActor m_bgWin[NUM_PLAYERS];
|
|
||||||
AutoActor m_bgWinFever[NUM_PLAYERS];
|
|
||||||
RageTimer m_2DIdleTimer[NUM_PLAYERS];
|
|
||||||
|
|
||||||
int m_i2DAnimState[NUM_PLAYERS];
|
std::array<AutoActor, NUM_PLAYERS> m_bgIdle;
|
||||||
|
std::array<AutoActor, NUM_PLAYERS> m_bgMiss;
|
||||||
|
std::array<AutoActor, NUM_PLAYERS> m_bgGood;
|
||||||
|
std::array<AutoActor, NUM_PLAYERS> m_bgGreat;
|
||||||
|
std::array<AutoActor, NUM_PLAYERS> m_bgFever;
|
||||||
|
std::array<AutoActor, NUM_PLAYERS> m_bgFail;
|
||||||
|
std::array<AutoActor, NUM_PLAYERS> m_bgWin;
|
||||||
|
std::array<AutoActor, NUM_PLAYERS> m_bgWinFever;
|
||||||
|
std::array<RageTimer, NUM_PLAYERS> m_2DIdleTimer;
|
||||||
|
|
||||||
|
std::array<int, NUM_PLAYERS> m_i2DAnimState;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user