remove TransitionInvisible
This commit is contained in:
@@ -57,7 +57,6 @@ StepMania = global.h ScreenDimensions.h StdString.h StepMania.cpp StepMania.h
|
||||
|
||||
Transitions = \
|
||||
Transition.cpp Transition.h TransitionFade.cpp TransitionFade.h TransitionFadeWipe.cpp TransitionFadeWipe.h \
|
||||
TransitionInvisible.cpp TransitionInvisible.h \
|
||||
TransitionOniFade.cpp TransitionOniFade.h TransitionRectWipe.cpp TransitionRectWipe.h \
|
||||
TransitionStarWipe.cpp TransitionStarWipe.h TransitionBGAnimation.cpp TransitionBGAnimation.h
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
#include "Screen.h"
|
||||
#include "Sprite.h"
|
||||
#include "RandomSample.h"
|
||||
#include "TransitionInvisible.h"
|
||||
#include "MenuElements.h"
|
||||
|
||||
|
||||
|
||||
@@ -391,7 +391,9 @@ void ScreenOptions::DrawPrimitives()
|
||||
|
||||
void ScreenOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
|
||||
{
|
||||
if( m_Wipe.IsClosing() )
|
||||
/* Allow input when transitioning in (m_In.IsTransitioning()), but ignore it
|
||||
* when we're transitioning out. */
|
||||
if( m_Menu.m_Back.IsTransitioning() || m_Menu.m_Out.IsTransitioning() )
|
||||
return;
|
||||
|
||||
// default input handler
|
||||
@@ -417,7 +419,6 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
|
||||
m_Menu.StartTransitioning( SM_GoToNextScreen );
|
||||
|
||||
m_SoundStart.Play();
|
||||
m_Wipe.CloseWipingRight( );
|
||||
|
||||
m_framePage.BeginTweening( 0.3f, Actor::TWEEN_ACCELERATE );
|
||||
m_framePage.SetTweenX( SCREEN_RIGHT );
|
||||
@@ -564,16 +565,6 @@ void ScreenOptions::MenuDown( PlayerNumber pn )
|
||||
|
||||
m_iCurrentRow[p]++;
|
||||
|
||||
// Chris: Commented this out, but will add back in later.
|
||||
// /* Find the next row with any un-dimmed entries. */
|
||||
// int new_row = m_iCurrentRow[p];
|
||||
// do {
|
||||
// if( ++new_row == m_iNumOptionRows )
|
||||
// new_row = 0; // wrap around
|
||||
// if(!RowCompletelyDimmed(new_row)) break;
|
||||
// } while(new_row != m_iCurrentRow[p]);
|
||||
// m_iCurrentRow[p] = new_row;
|
||||
|
||||
TweenCursor( (PlayerNumber)p );
|
||||
}
|
||||
m_SoundNextRow.Play();
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
#include "Sprite.h"
|
||||
#include "BitmapText.h"
|
||||
#include "RandomSample.h"
|
||||
#include "TransitionInvisible.h"
|
||||
#include "Quad.h"
|
||||
#include "MenuElements.h"
|
||||
#include "OptionsCursor.h"
|
||||
@@ -119,8 +118,6 @@ protected:
|
||||
RageSound m_SoundNextRow;
|
||||
RageSound m_SoundPrevRow;
|
||||
RageSound m_SoundStart;
|
||||
|
||||
TransitionInvisible m_Wipe;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -912,14 +912,6 @@ SOURCE=.\TransitionFadeWipe.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\TransitionInvisible.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\TransitionInvisible.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\TransitionOniFade.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -977,12 +977,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
|
||||
<File
|
||||
RelativePath=".\TransitionFadeWipe.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\TransitionInvisible.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\TransitionInvisible.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="TransitionOniFade.cpp">
|
||||
</File>
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
#include "global.h"
|
||||
/*
|
||||
-----------------------------------------------------------------------------
|
||||
Class: TransitionInvisible
|
||||
|
||||
Desc: See header.
|
||||
|
||||
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
|
||||
Chris Danford
|
||||
-----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
#include "TransitionInvisible.h"
|
||||
|
||||
TransitionInvisible::TransitionInvisible()
|
||||
{
|
||||
}
|
||||
|
||||
void TransitionInvisible::DrawPrimitives()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
#ifndef TRANSITIONINVISIBLE_H
|
||||
#define TRANSITIONINVISIBLE_H
|
||||
/*
|
||||
-----------------------------------------------------------------------------
|
||||
Class: TransitionInvisible
|
||||
|
||||
Desc: Doesn't draw anything. Only used for timing.
|
||||
|
||||
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
|
||||
Chris Danford
|
||||
-----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
#include "Transition.h"
|
||||
|
||||
class TransitionInvisible : public Transition
|
||||
{
|
||||
public:
|
||||
TransitionInvisible();
|
||||
|
||||
virtual void DrawPrimitives();
|
||||
|
||||
protected:
|
||||
};
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user