make the BGM time available to actors
This commit is contained in:
@@ -8,7 +8,7 @@
|
|||||||
#include "RageLog.h"
|
#include "RageLog.h"
|
||||||
#include "arch/Dialog/Dialog.h"
|
#include "arch/Dialog/Dialog.h"
|
||||||
|
|
||||||
static float g_fCurrentBGMTime = 0;
|
float Actor::g_fCurrentBGMTime = 0;
|
||||||
|
|
||||||
/* This is Reset instead of Init since many derived classes have Init() functions
|
/* This is Reset instead of Init since many derived classes have Init() functions
|
||||||
* that shouldn't change the position of the actor. */
|
* that shouldn't change the position of the actor. */
|
||||||
@@ -59,11 +59,6 @@ Actor::Actor()
|
|||||||
m_bFirstUpdate = true;
|
m_bFirstUpdate = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Actor::SetBGMTime( float fTime )
|
|
||||||
{
|
|
||||||
g_fCurrentBGMTime = fTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Actor::Draw()
|
void Actor::Draw()
|
||||||
{
|
{
|
||||||
if( m_bHidden )
|
if( m_bHidden )
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ public:
|
|||||||
virtual ~Actor() {}
|
virtual ~Actor() {}
|
||||||
virtual void Reset();
|
virtual void Reset();
|
||||||
|
|
||||||
static void SetBGMTime( float fTime );
|
static void SetBGMTime( float fTime ) { g_fCurrentBGMTime = fTime; }
|
||||||
|
static float GetBGMTime() { return g_fCurrentBGMTime; }
|
||||||
|
|
||||||
enum TweenType {
|
enum TweenType {
|
||||||
TWEEN_LINEAR,
|
TWEEN_LINEAR,
|
||||||
@@ -391,6 +392,11 @@ protected:
|
|||||||
ZTestMode m_ZTestMode;
|
ZTestMode m_ZTestMode;
|
||||||
bool m_bZWrite;
|
bool m_bZWrite;
|
||||||
CullMode m_CullMode;
|
CullMode m_CullMode;
|
||||||
|
|
||||||
|
//
|
||||||
|
// global state
|
||||||
|
///
|
||||||
|
static float g_fCurrentBGMTime;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user