From e39dc66c34bda8b80f4903b8ca4f8c8c0d04e786 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 22 Mar 2003 19:58:44 +0000 Subject: [PATCH] remove TransitionInvisible --- stepmania/src/Makefile.am | 1 - stepmania/src/ScreenInstructions.h | 1 - stepmania/src/ScreenOptions.cpp | 15 +++------------ stepmania/src/ScreenOptions.h | 3 --- stepmania/src/StepMania.dsp | 8 -------- stepmania/src/StepMania.vcproj | 6 ------ stepmania/src/TransitionInvisible.cpp | 24 ------------------------ stepmania/src/TransitionInvisible.h | 27 --------------------------- 8 files changed, 3 insertions(+), 82 deletions(-) delete mode 100644 stepmania/src/TransitionInvisible.cpp delete mode 100644 stepmania/src/TransitionInvisible.h diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index 2d83c01e39..245565e0e1 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -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 diff --git a/stepmania/src/ScreenInstructions.h b/stepmania/src/ScreenInstructions.h index ef8b229f51..7dbd389ad4 100644 --- a/stepmania/src/ScreenInstructions.h +++ b/stepmania/src/ScreenInstructions.h @@ -15,7 +15,6 @@ #include "Screen.h" #include "Sprite.h" #include "RandomSample.h" -#include "TransitionInvisible.h" #include "MenuElements.h" diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index dc2566d06e..39f9d38c7c 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -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(); diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 48a8b5263e..c5d6ff2832 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -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; }; diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index ff2959ce66..c86ada3c62 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -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 diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index b98bc4d174..d1ff6b9fa7 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -977,12 +977,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ - - - - diff --git a/stepmania/src/TransitionInvisible.cpp b/stepmania/src/TransitionInvisible.cpp deleted file mode 100644 index 5ca3ece373..0000000000 --- a/stepmania/src/TransitionInvisible.cpp +++ /dev/null @@ -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() -{ -} - - diff --git a/stepmania/src/TransitionInvisible.h b/stepmania/src/TransitionInvisible.h deleted file mode 100644 index d5e79c202d..0000000000 --- a/stepmania/src/TransitionInvisible.h +++ /dev/null @@ -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