get rid of RandomStream
This commit is contained in:
@@ -23,6 +23,7 @@
|
|||||||
#include "GameState.h"
|
#include "GameState.h"
|
||||||
#include "GrooveRadar.h"
|
#include "GrooveRadar.h"
|
||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
|
#include "RageMusic.h"
|
||||||
|
|
||||||
|
|
||||||
#define SONGSEL_SCREEN THEME->GetMetric("ScreenEvaluation","SongSelectScreen")
|
#define SONGSEL_SCREEN THEME->GetMetric("ScreenEvaluation","SongSelectScreen")
|
||||||
|
|||||||
@@ -12,7 +12,6 @@
|
|||||||
|
|
||||||
#include "Screen.h"
|
#include "Screen.h"
|
||||||
#include "Sprite.h"
|
#include "Sprite.h"
|
||||||
#include "RandomStream.h"
|
|
||||||
#include "BitmapText.h"
|
#include "BitmapText.h"
|
||||||
#include "GradeDisplay.h"
|
#include "GradeDisplay.h"
|
||||||
#include "MenuElements.h"
|
#include "MenuElements.h"
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
#include "BitmapText.h"
|
#include "BitmapText.h"
|
||||||
#include "Player.h"
|
#include "Player.h"
|
||||||
#include "RandomSample.h"
|
#include "RandomSample.h"
|
||||||
#include "RandomStream.h"
|
|
||||||
#include "FocusingSprite.h"
|
#include "FocusingSprite.h"
|
||||||
#include "RageMusic.h"
|
#include "RageMusic.h"
|
||||||
#include "RageSound.h"
|
#include "RageSound.h"
|
||||||
|
|||||||
@@ -13,7 +13,6 @@
|
|||||||
#include "Sprite.h"
|
#include "Sprite.h"
|
||||||
#include "TransitionFade.h"
|
#include "TransitionFade.h"
|
||||||
#include "RageSoundStream.h"
|
#include "RageSoundStream.h"
|
||||||
#include "Screen.h"
|
|
||||||
#include "MenuElements.h"
|
#include "MenuElements.h"
|
||||||
|
|
||||||
|
|
||||||
@@ -44,8 +43,6 @@ private:
|
|||||||
float m_fTimeLeftInScreen;
|
float m_fTimeLeftInScreen;
|
||||||
|
|
||||||
TransitionFade m_Fade;
|
TransitionFade m_Fade;
|
||||||
|
|
||||||
RageSoundStream m_soundMusic;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,6 @@
|
|||||||
#include "Screen.h"
|
#include "Screen.h"
|
||||||
#include "Sprite.h"
|
#include "Sprite.h"
|
||||||
#include "BitmapText.h"
|
#include "BitmapText.h"
|
||||||
#include "RandomStream.h"
|
|
||||||
#include "GameConstantsAndTypes.h"
|
#include "GameConstantsAndTypes.h"
|
||||||
#include "MusicWheel.h"
|
#include "MusicWheel.h"
|
||||||
#include "Banner.h"
|
#include "Banner.h"
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
#include "InputMapper.h"
|
#include "InputMapper.h"
|
||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
#include "SDL_Utils.h"
|
#include "SDL_Utils.h"
|
||||||
|
#include "RageMusic.h"
|
||||||
|
|
||||||
const CString CHOICE_TEXT[ScreenTitleMenu::NUM_TITLE_MENU_CHOICES] = {
|
const CString CHOICE_TEXT[ScreenTitleMenu::NUM_TITLE_MENU_CHOICES] = {
|
||||||
"GAME START",
|
"GAME START",
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
#include "BitmapText.h"
|
#include "BitmapText.h"
|
||||||
#include "TransitionFade.h"
|
#include "TransitionFade.h"
|
||||||
#include "RandomSample.h"
|
#include "RandomSample.h"
|
||||||
#include "RandomStream.h"
|
|
||||||
#include "BGAnimation.h"
|
#include "BGAnimation.h"
|
||||||
|
|
||||||
|
|
||||||
@@ -63,7 +62,7 @@ private:
|
|||||||
|
|
||||||
TransitionFade m_Fade;
|
TransitionFade m_Fade;
|
||||||
|
|
||||||
RandomStream m_soundAttract;
|
RandomSample m_soundAttract;
|
||||||
RandomSample m_soundChange;
|
RandomSample m_soundChange;
|
||||||
RandomSample m_soundSelect;
|
RandomSample m_soundSelect;
|
||||||
RandomSample m_soundInvalid;
|
RandomSample m_soundInvalid;
|
||||||
|
|||||||
@@ -502,14 +502,6 @@ SOURCE=.\RandomSample.h
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin 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
|
SOURCE=.\Song.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|||||||
@@ -514,12 +514,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
|
|||||||
<File
|
<File
|
||||||
RelativePath=".\RandomSample.h">
|
RelativePath=".\RandomSample.h">
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath=".\RandomStream.cpp">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath=".\RandomStream.h">
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath=".\Song.cpp">
|
RelativePath=".\Song.cpp">
|
||||||
</File>
|
</File>
|
||||||
|
|||||||
Reference in New Issue
Block a user