diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp index b969b8907a..57069d6fd0 100644 --- a/stepmania/src/BGAnimationLayer.cpp +++ b/stepmania/src/BGAnimationLayer.cpp @@ -477,11 +477,11 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer ) else if( sFile == "" ) { RageException::Throw( "In the ini file for BGAnimation '%s', '%s' is missing a the line 'File='.", sAniDir.GetString(), sLayer.GetString() ); - - if( !DoesFileExist(sPath) ) - RageException::Throw( "In the ini file for BGAnimation '%s', the specified File '%s' does not exist.", sAniDir.GetString(), sFile.GetString() ); } + if( !DoesFileExist(sPath) ) + RageException::Throw( "In the ini file for BGAnimation '%s', the specified File '%s' does not exist.", sAniDir.GetString(), sFile.GetString() ); + ini.GetValueI( sLayer, "Type", (int&)m_Type ); ini.GetValue ( sLayer, "Command", m_sCommand ); ini.GetValueF( sLayer, "StretchTexCoordVelocityX", m_fStretchTexCoordVelocityX ); diff --git a/stepmania/src/MenuElements.h b/stepmania/src/MenuElements.h index b21e49fc96..e6c9cac96b 100644 --- a/stepmania/src/MenuElements.h +++ b/stepmania/src/MenuElements.h @@ -12,18 +12,14 @@ ----------------------------------------------------------------------------- */ - #include "Screen.h" #include "Sprite.h" #include "MenuTimer.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" #include "HelpDisplay.h" #include "BGAnimation.h" -const float MENU_ELEMENTS_TWEEN_TIME = 0.5f; - - class MenuElements : public ActorFrame { public: @@ -53,9 +49,9 @@ public: // let owner tinker with these objects Sprite m_sprFooter; HelpDisplay m_textHelp; - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; - TransitionBGAnimation m_Back; + Transition m_In; + Transition m_Out; + Transition m_Back; RageSound m_soundBack; diff --git a/stepmania/src/ScreenAttract.h b/stepmania/src/ScreenAttract.h index 1e44f289d6..cfb5c2c44c 100644 --- a/stepmania/src/ScreenAttract.h +++ b/stepmania/src/ScreenAttract.h @@ -15,7 +15,7 @@ #include "Screen.h" #include "Sprite.h" #include "BitmapText.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" #include "RandomSample.h" #include "BGAnimation.h" #include "RageTimer.h" @@ -36,8 +36,8 @@ public: protected: BGAnimation m_Background; - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; + Transition m_In; + Transition m_Out; RandomSample m_soundStart; }; diff --git a/stepmania/src/ScreenCaution.h b/stepmania/src/ScreenCaution.h index be291e5456..acd4b543dd 100644 --- a/stepmania/src/ScreenCaution.h +++ b/stepmania/src/ScreenCaution.h @@ -16,7 +16,7 @@ #include "Screen.h" #include "RandomSample.h" #include "BGAnimation.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" class ScreenCaution : public Screen @@ -31,9 +31,9 @@ protected: void MenuStart( PlayerNumber pn ); void MenuBack( PlayerNumber pn ); BGAnimation m_Background; - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; - TransitionBGAnimation m_Back; + Transition m_In; + Transition m_Out; + Transition m_Back; }; #endif diff --git a/stepmania/src/ScreenCredits.h b/stepmania/src/ScreenCredits.h index 9e589aeb00..cb734412bb 100644 --- a/stepmania/src/ScreenCredits.h +++ b/stepmania/src/ScreenCredits.h @@ -10,7 +10,7 @@ */ #include "Screen.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" #include "ActorScroller.h" @@ -44,8 +44,8 @@ private: BGAnimation m_Overlay; - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; + Transition m_In; + Transition m_Out; }; diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h index b50f9c6a1b..c999ea67cc 100644 --- a/stepmania/src/ScreenEdit.h +++ b/stepmania/src/ScreenEdit.h @@ -11,7 +11,7 @@ #include "Screen.h" #include "Sprite.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" #include "BitmapText.h" #include "Player.h" #include "RandomSample.h" @@ -79,8 +79,8 @@ protected: RageSound m_soundChangeSnap; RageSound m_soundMarker; - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; + Transition m_In; + Transition m_Out; // for MODE_RECORD diff --git a/stepmania/src/ScreenGameOver.h b/stepmania/src/ScreenGameOver.h index 45c95a42f1..51e6ee42c2 100644 --- a/stepmania/src/ScreenGameOver.h +++ b/stepmania/src/ScreenGameOver.h @@ -11,7 +11,7 @@ #include "Screen.h" #include "BGAnimation.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" class ScreenGameOver : public Screen @@ -25,8 +25,8 @@ public: private: - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; + Transition m_In; + Transition m_Out; BGAnimation m_Background; }; diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 7404fa58bf..768a65a723 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -827,9 +827,6 @@ void ScreenGameplay::Update( float fDeltaTime ) if(m_soundMusic.IsPlaying()) GAMESTATE->UpdateSongPosition(m_soundMusic.GetPositionSeconds()); - if( m_bZeroDeltaOnNextUpdate ) - int sdkjfskdf = 0; - if( m_bZeroDeltaOnNextUpdate ) { Screen::Update( 0 ); diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 5523ff8ff6..34b22f8849 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -13,7 +13,7 @@ #include "Screen.h" #include "Sprite.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" #include "BitmapText.h" #include "Player.h" #include "RandomSample.h" @@ -97,8 +97,8 @@ protected: Background m_Background; - TransitionBGAnimation m_NextSongIn; // shows between songs in a course - TransitionBGAnimation m_NextSongOut; // shows between songs in a course + Transition m_NextSongIn; // shows between songs in a course + Transition m_NextSongOut; // shows between songs in a course Sprite m_sprLifeFrame; LifeMeter* m_pLifeMeter[NUM_PLAYERS]; @@ -120,14 +120,14 @@ protected: BitmapText m_MaxCombo; - TransitionBGAnimation m_Ready; - TransitionBGAnimation m_Go; - TransitionBGAnimation m_Cleared; - TransitionBGAnimation m_Failed; - TransitionBGAnimation m_Extra; - TransitionBGAnimation m_Toasty; // easter egg - TransitionBGAnimation m_In; - TransitionBGAnimation m_Back; + Transition m_Ready; + Transition m_Go; + Transition m_Cleared; + Transition m_Failed; + Transition m_Extra; + Transition m_Toasty; // easter egg + Transition m_In; + Transition m_Back; BitmapText m_textSurviveTime; // used in extra stage BitmapText m_textSongTitle; diff --git a/stepmania/src/ScreenJukebox.h b/stepmania/src/ScreenJukebox.h index 1f69971171..cb4a65c75b 100644 --- a/stepmania/src/ScreenJukebox.h +++ b/stepmania/src/ScreenJukebox.h @@ -29,8 +29,8 @@ public: static bool SetSong(); protected: - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; + Transition m_In; + Transition m_Out; static bool PrepareForJukebox(); }; diff --git a/stepmania/src/ScreenMiniMenu.h b/stepmania/src/ScreenMiniMenu.h index 9db613a042..5594872e06 100644 --- a/stepmania/src/ScreenMiniMenu.h +++ b/stepmania/src/ScreenMiniMenu.h @@ -12,7 +12,7 @@ #include "Screen.h" #include "BitmapText.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" #include "Quad.h" #include "RandomSample.h" @@ -100,8 +100,8 @@ protected: int m_iCurLine; int m_iCurAnswers[MAX_MENU_ROWS]; ScreenMessage m_SMSendOnOK, m_SMSendOnCancel; - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; + Transition m_In; + Transition m_Out; public: static int s_iLastLine; diff --git a/stepmania/src/ScreenMusicScroll.h b/stepmania/src/ScreenMusicScroll.h index 1ab9f8851f..8a20402894 100644 --- a/stepmania/src/ScreenMusicScroll.h +++ b/stepmania/src/ScreenMusicScroll.h @@ -11,7 +11,7 @@ #include "Screen.h" #include "Sprite.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" #include "RageSoundManager.h" #include "MenuElements.h" @@ -42,8 +42,8 @@ private: unsigned m_iNumLines; float m_fTimeLeftInScreen; - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; + Transition m_In; + Transition m_Out; }; diff --git a/stepmania/src/ScreenNameEntry.h b/stepmania/src/ScreenNameEntry.h index f9f1b25117..77e5fec384 100644 --- a/stepmania/src/ScreenNameEntry.h +++ b/stepmania/src/ScreenNameEntry.h @@ -11,7 +11,7 @@ #include "Screen.h" #include "BitmapText.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" #include "RandomSample.h" #include "GrayArrowRow.h" #include "BGAnimation.h" @@ -41,8 +41,8 @@ private: BitmapText m_textCategory[NUM_PLAYERS]; MenuTimer m_Timer; - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; + Transition m_In; + Transition m_Out; RageSound m_soundStep; diff --git a/stepmania/src/ScreenPrompt.h b/stepmania/src/ScreenPrompt.h index 52106febcb..b1c23548fc 100644 --- a/stepmania/src/ScreenPrompt.h +++ b/stepmania/src/ScreenPrompt.h @@ -12,7 +12,7 @@ #include "Screen.h" #include "BitmapText.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" #include "Quad.h" #include "RandomSample.h" @@ -44,7 +44,7 @@ protected: ScreenMessage m_SMSendWhenDone; void(*m_pOnYes)(); void(*m_pOnNo)(); - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; + Transition m_In; + Transition m_Out; }; diff --git a/stepmania/src/ScreenSelectStyle5th.cpp b/stepmania/src/ScreenSelectStyle5th.cpp index 90c2b3211f..032ded3b69 100644 --- a/stepmania/src/ScreenSelectStyle5th.cpp +++ b/stepmania/src/ScreenSelectStyle5th.cpp @@ -24,6 +24,8 @@ #include "ThemeManager.h" #include "AnnouncerManager.h" +const float MENU_ELEMENTS_TWEEN_TIME = 0.5; + #define HELP_TEXT THEME->GetMetric("ScreenSelectStyle5th","HelpText") #define TIMER_SECONDS THEME->GetMetricI("ScreenSelectStyle5th","TimerSeconds") #define NEXT_SCREEN THEME->GetMetric("ScreenSelectStyle5th","NextScreen") diff --git a/stepmania/src/ScreenStage.h b/stepmania/src/ScreenStage.h index 00173db520..a7f3001f65 100644 --- a/stepmania/src/ScreenStage.h +++ b/stepmania/src/ScreenStage.h @@ -10,7 +10,7 @@ */ #include "Screen.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" class ScreenStage : public Screen { @@ -51,7 +51,7 @@ private: Quad m_quadMask; // write this into ZBuffer as a mask */ - TransitionBGAnimation m_In, m_Out, m_Back; + Transition m_In, m_Out, m_Back; BGAnimation m_Background; protected: diff --git a/stepmania/src/ScreenTextEntry.h b/stepmania/src/ScreenTextEntry.h index 41d301bd88..ac99901a88 100644 --- a/stepmania/src/ScreenTextEntry.h +++ b/stepmania/src/ScreenTextEntry.h @@ -12,7 +12,7 @@ #include "Screen.h" #include "BitmapText.h" -#include "TransitionBGAnimation.h" +#include "Transition.h" #include "Quad.h" #include "RandomSample.h" @@ -46,7 +46,7 @@ protected: void(*m_pOnOK)( CString sAnswer ); void(*m_pOnCancel)(); bool m_bCancelled; - TransitionBGAnimation m_In; - TransitionBGAnimation m_Out; + Transition m_In; + Transition m_Out; }; diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 05a8444fc2..7e410e4148 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -60,7 +60,7 @@ IntDir=.\../Release6 TargetDir=\stepmania\stepmania TargetName=StepMania SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -95,7 +95,7 @@ IntDir=.\../Debug6 TargetDir=\stepmania\stepmania TargetName=StepMania-debug SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -1028,11 +1028,11 @@ SOURCE=.\CroppedSprite.h # End Source File # Begin Source File -SOURCE=.\TransitionBGAnimation.cpp +SOURCE=.\Transition.cpp # End Source File # Begin Source File -SOURCE=.\TransitionBGAnimation.h +SOURCE=.\Transition.h # End Source File # End Group # Begin Group "Actors used in Gameplay" diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index bcdc665e1d..ef53ac24e5 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -1036,10 +1036,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ RelativePath="CroppedSprite.h"> + RelativePath="Transition.cpp"> + RelativePath="Transition.h">