[splittiming] new EffectModes (not available from Lua yet), clarified error message

2011-05-14 17:03:49 -05:00
parent 4b89c0fae7
commit 6b0a939290
4 changed files with 23 additions and 1 deletions
@@ -109,6 +109,7 @@ public:
 	virtual void LoadFromNode( const XNode* pNode );

 	static void SetBGMTime( float fTime, float fBeat, float fTimeNoOffset, float fBeatNoOffset );
+	static void SetPlayerBGMBeat( PlayerNumber pn, float fBeat, float fBeatNoOffset );
 	static void SetBGMLight( int iLightNumber, float fCabinetLights );

 	/**
@@ -131,6 +132,8 @@ public:
 		CLOCK_BGM_BEAT,
 		CLOCK_BGM_TIME_NO_OFFSET,
 		CLOCK_BGM_BEAT_NO_OFFSET,
+		CLOCK_BGM_BEAT_PLAYER1,
+		CLOCK_BGM_BEAT_PLAYER2,
 		CLOCK_LIGHT_1 = 1000,
 		CLOCK_LIGHT_LAST = 1100,
 		NUM_CLOCKS
@@ -713,6 +716,7 @@ protected:
 	// global state
 	static float g_fCurrentBGMTime, g_fCurrentBGMBeat;
 	static float g_fCurrentBGMTimeNoOffset, g_fCurrentBGMBeatNoOffset;
+	static vector<float> g_vfCurrentBGMBeatPlayer, g_vfCurrentBGMBeatPlayerNoOffset;

 private:
 	// commands