actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Convert to the new arrays.

Browse Source
This commit is contained in:
Jason Felds
2013-05-05 09:34:57 -04:00
parent 7f01a4f052
commit b25758b3a8
1 changed files with 97 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DancingCharacters.h
+14 -12
View File
@@ -6,6 +6,7 @@
#include "ThemeManager.h"
#include "RageTimer.h"
#include "AutoActor.h"
#include <array>
class Model;
/** @brief The different animation states for the dancer. */
@@ -38,7 +39,7 @@ public:
void Change2DAnimState( PlayerNumber pn, int iState );
protected:
Model *m_pCharacter[NUM_PLAYERS];
std::array<Model *, NUM_PLAYERS> m_pCharacter;
/** @brief How far away is the camera from the dancer? */
float m_CameraDistance;
@@ -50,19 +51,20 @@ protected:
float m_fThisCameraStartBeat;
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