TransitionBGAnimation -> Transition

This commit is contained in:
Chris Danford
2003-04-13 02:33:11 +00:00
parent 5e4ec48c3f
commit e30e6a7ee3
2 changed files with 14 additions and 14 deletions
@@ -1,7 +1,7 @@
#include "global.h"
/*
-----------------------------------------------------------------------------
Class: TransitionBGAnimation
Class: Transition
Desc: See header
@@ -10,19 +10,19 @@
-----------------------------------------------------------------------------
*/
#include "TransitionBGAnimation.h"
#include "Transition.h"
#include "RageUtil.h"
#include "ScreenManager.h"
#include "IniFile.h"
TransitionBGAnimation::TransitionBGAnimation()
Transition::Transition()
{
m_State = waiting;
m_fSecsIntoTransition = 0.0f;
}
void TransitionBGAnimation::Load( CString sBGAniDir )
void Transition::Load( CString sBGAniDir )
{
if( !sBGAniDir.empty() && sBGAniDir.Right(1) != "/" )
sBGAniDir += "/";
@@ -45,7 +45,7 @@ void TransitionBGAnimation::Load( CString sBGAniDir )
}
void TransitionBGAnimation::Update( float fDeltaTime )
void Transition::Update( float fDeltaTime )
{
Actor::Update( fDeltaTime );
@@ -63,7 +63,7 @@ void TransitionBGAnimation::Update( float fDeltaTime )
}
}
void TransitionBGAnimation::DrawPrimitives()
void Transition::DrawPrimitives()
{
// Unless we're transitioning, don't draw because we'll waste resources drawing things
// that aren't visible. -Chris
@@ -73,7 +73,7 @@ void TransitionBGAnimation::DrawPrimitives()
m_BGAnimation.Draw();
}
void TransitionBGAnimation::StartTransitioning( ScreenMessage send_when_done )
void Transition::StartTransitioning( ScreenMessage send_when_done )
{
ASSERT( m_State == waiting ); // can't call this more than once
m_MessageToSendWhenDone = send_when_done;
@@ -82,7 +82,7 @@ void TransitionBGAnimation::StartTransitioning( ScreenMessage send_when_done )
m_fSecsIntoTransition = 0.0;
}
float TransitionBGAnimation::GetLengthSeconds()
float Transition::GetLengthSeconds()
{
return m_BGAnimation.GetLengthSeconds();
}
@@ -1,10 +1,10 @@
#ifndef TransitionBGAnimation_H
#define TransitionBGAnimation_H
#ifndef Transition_H
#define Transition_H
/*
-----------------------------------------------------------------------------
Class: TransitionBGAnimation
Class: Transition
Desc: TransitionBGAnimation that draws BGAnimation.
Desc: Transition that draws BGAnimation.
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
Chris Danford
@@ -17,10 +17,10 @@
#include "RandomSample.h"
class TransitionBGAnimation : public Actor
class Transition : public Actor
{
public:
TransitionBGAnimation();
Transition();
void Load( CString sBGAniDir );