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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-04-29 00:07:33 +00:00
parent 4bba3fbaa8
commit 4ad1b23244
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+6 -5
View File
@@ -25,7 +25,7 @@ LUA_REGISTER_CLASS( Actor )
float Actor::g_fCurrentBGMTime = 0, Actor::g_fCurrentBGMBeat;
static float g_bCabinetLights[NUM_CABINET_LIGHTS];
static float g_fCabinetLights[NUM_CABINET_LIGHTS];
void Actor::SetBGMTime( float fTime, float fBeat )
{
@@ -33,9 +33,10 @@ void Actor::SetBGMTime( float fTime, float fBeat )
g_fCurrentBGMBeat = fBeat;
}
void Actor::SetBGMLights( const float *bCabinetLights )
void Actor::SetBGMLight( int iLightNumber, float fCabinetLights )
{
memcpy( g_bCabinetLights, bCabinetLights, sizeof(float) * NUM_CABINET_LIGHTS );
ASSERT( iLightNumber < NUM_CABINET_LIGHTS );
g_fCabinetLights[iLightNumber] = fCabinetLights;
}
/* This is Reset instead of Init since many derived classes have Init() functions
@@ -493,8 +494,8 @@ void Actor::Update( float fDeltaTime )
if( m_EffectClock >= CLOCK_LIGHT_1 && m_EffectClock <= CLOCK_LIGHT_LAST )
{
int i = m_EffectClock - CLOCK_LIGHT_1;
m_fEffectDelta = g_bCabinetLights[i] - m_fSecsIntoEffect;
m_fSecsIntoEffect = g_bCabinetLights[i];
m_fEffectDelta = g_fCabinetLights[i] - m_fSecsIntoEffect;
m_fSecsIntoEffect = g_fCabinetLights[i];
}
break;
}
stepmania/src/Actor.h
+1 -1
View File
@@ -32,7 +32,7 @@ public:
void LoadFromNode( const CString& sDir, const XNode* pNode );
static void SetBGMTime( float fTime, float fBeat );
static void SetBGMLights( const float *abCabinetLights );
static void SetBGMLight( int iLightNumber, float fCabinetLights );
enum TweenType {
TWEEN_LINEAR,