From 2b6201b066482b8af80966c46cdc768e372f1712 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 2 Jan 2003 07:10:18 +0000 Subject: [PATCH] get rid of RandomStream --- stepmania/src/ScreenEvaluation.cpp | 1 + stepmania/src/ScreenEvaluation.h | 1 - stepmania/src/ScreenGameplay.h | 1 - stepmania/src/ScreenMusicScroll.h | 3 --- stepmania/src/ScreenSelectMusic.h | 1 - stepmania/src/ScreenTitleMenu.cpp | 1 + stepmania/src/ScreenTitleMenu.h | 3 +-- stepmania/src/StepMania.dsp | 8 -------- stepmania/src/StepMania.vcproj | 6 ------ 9 files changed, 3 insertions(+), 22 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index e4f067c5c0..f186c19783 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -23,6 +23,7 @@ #include "GameState.h" #include "GrooveRadar.h" #include "ThemeManager.h" +#include "RageMusic.h" #define SONGSEL_SCREEN THEME->GetMetric("ScreenEvaluation","SongSelectScreen") diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index 4a1f1b52c9..d3d99110b5 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -12,7 +12,6 @@ #include "Screen.h" #include "Sprite.h" -#include "RandomStream.h" #include "BitmapText.h" #include "GradeDisplay.h" #include "MenuElements.h" diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 9f9f728cf8..992caddfca 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -16,7 +16,6 @@ #include "BitmapText.h" #include "Player.h" #include "RandomSample.h" -#include "RandomStream.h" #include "FocusingSprite.h" #include "RageMusic.h" #include "RageSound.h" diff --git a/stepmania/src/ScreenMusicScroll.h b/stepmania/src/ScreenMusicScroll.h index 736b8aa257..3a84e0f17a 100644 --- a/stepmania/src/ScreenMusicScroll.h +++ b/stepmania/src/ScreenMusicScroll.h @@ -13,7 +13,6 @@ #include "Sprite.h" #include "TransitionFade.h" #include "RageSoundStream.h" -#include "Screen.h" #include "MenuElements.h" @@ -44,8 +43,6 @@ private: float m_fTimeLeftInScreen; TransitionFade m_Fade; - - RageSoundStream m_soundMusic; }; diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 4fd0c5bf18..af2e8a7fdd 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -12,7 +12,6 @@ #include "Screen.h" #include "Sprite.h" #include "BitmapText.h" -#include "RandomStream.h" #include "GameConstantsAndTypes.h" #include "MusicWheel.h" #include "Banner.h" diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 629cc1bbda..e8087358b4 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -24,6 +24,7 @@ #include "InputMapper.h" #include "ThemeManager.h" #include "SDL_Utils.h" +#include "RageMusic.h" const CString CHOICE_TEXT[ScreenTitleMenu::NUM_TITLE_MENU_CHOICES] = { "GAME START", diff --git a/stepmania/src/ScreenTitleMenu.h b/stepmania/src/ScreenTitleMenu.h index 080025c8a5..722a7efdc9 100644 --- a/stepmania/src/ScreenTitleMenu.h +++ b/stepmania/src/ScreenTitleMenu.h @@ -14,7 +14,6 @@ #include "BitmapText.h" #include "TransitionFade.h" #include "RandomSample.h" -#include "RandomStream.h" #include "BGAnimation.h" @@ -63,7 +62,7 @@ private: TransitionFade m_Fade; - RandomStream m_soundAttract; + RandomSample m_soundAttract; RandomSample m_soundChange; RandomSample m_soundSelect; RandomSample m_soundInvalid; diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 3be3661ed1..6682feda1c 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -502,14 +502,6 @@ SOURCE=.\RandomSample.h # End Source File # Begin Source File -SOURCE=.\RandomStream.cpp -# End Source File -# Begin Source File - -SOURCE=.\RandomStream.h -# End Source File -# Begin Source File - SOURCE=.\Song.cpp # End Source File # Begin Source File diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index e79080bcbd..36b0d8d004 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -514,12 +514,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ - - - -