actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of MUSIC

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-02 07:54:28 +00:00
parent 2b7dad6766
commit 24a3592741
38 changed files with 40 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MenuElements.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "MenuElements.h"
#include "RageTextureManager.h"
#include "RageUtil.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ScreenManager.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
stepmania/src/MusicBannerWheel.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#include "PrefsManager.h"
#include "SongManager.h"
#include "ThemeManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "StyleDef.h"
#define BANNERSPACING 200
stepmania/src/MusicWheel.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include "SongManager.h"
#include "GameManager.h"
#include "PrefsManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ScreenManager.h" // for sending SM_PlayMusicSample
#include "RageLog.h"
#include "GameConstantsAndTypes.h"
stepmania/src/ScreenAppearanceOptions.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "ScreenAppearanceOptions.h"
#include "RageTextureManager.h"
#include "RageUtil.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ScreenManager.h"
#include "PrefsManager.h"
#include "GameConstantsAndTypes.h"
stepmania/src/ScreenCaution.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include "PrefsManager.h"
#include "AnnouncerManager.h"
#include "GameState.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ThemeManager.h"
stepmania/src/ScreenEdit.h
+1 -1
View File
@@ -16,7 +16,7 @@
#include "Player.h"
#include "RandomSample.h"
#include "FocusingSprite.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "RageSound.h"
#include "MotionBlurSprite.h"
#include "BGAnimation.h"
stepmania/src/ScreenEditMenu.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "GameManager.h"
#include "RageLog.h"
#include "GameState.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ThemeManager.h"
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include "GameState.h"
#include "GrooveRadar.h"
#include "ThemeManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#define SONGSEL_SCREEN THEME->GetMetric("ScreenEvaluation","SongSelectScreen")
stepmania/src/ScreenEz2SelectMusic.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include "SDL_opengl.h"
#include "ScreenSandbox.h"
#include "ScreenManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "ThemeManager.h"
stepmania/src/ScreenEz2SelectPlayer.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ Andrew Livy
#include "ScreenEz2SelectPlayer.h"
#include "ScreenManager.h"
#include "PrefsManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "GameManager.h"
stepmania/src/ScreenGameOver.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "ScreenManager.h"
#include "AnnouncerManager.h"
#include "GameState.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ThemeManager.h"
stepmania/src/ScreenGameplay.h
+4 -4
View File
@@ -11,21 +11,21 @@
#include "Screen.h"
#include "Sprite.h"
#include "TransitionStarWipe.h"
#include "TransitionFade.h"
#include "TransitionStarWipe.h"
#include "TransitionFadeWipe.h"
#include "TransitionOniFade.h"
#include "BitmapText.h"
#include "Player.h"
#include "RandomSample.h"
#include "FocusingSprite.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "RageSound.h"
#include "MotionBlurSprite.h"
#include "Background.h"
#include "LifeMeter.h"
#include "ScoreDisplay.h"
#include "DifficultyIcon.h"
#include "TransitionFadeWipe.h"
#include "TransitionOniFade.h"
#include "BPMDisplay.h"
// messages sent by Combo
stepmania/src/ScreenGraphicOptions.cpp
+1 -3
View File
@@ -13,14 +13,12 @@
#include "ScreenGraphicOptions.h"
#include "RageTextureManager.h"
#include "RageUtil.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ScreenManager.h"
#include "PrefsManager.h"
#include "GameConstantsAndTypes.h"
#include "StepMania.h"
#include "PrefsManager.h"
#include "RageLog.h"
#include "PrefsManager.h"
#include "ThemeManager.h"
#include "RageDisplay.h"
stepmania/src/ScreenHowToPlay.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "ScreenHowToPlay.h"
#include "RageTextureManager.h"
#include "RageUtil.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ScreenManager.h"
#include "GameConstantsAndTypes.h"
#include "RageLog.h"
stepmania/src/ScreenInputOptions.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "ScreenInputOptions.h"
#include "RageTextureManager.h"
#include "RageUtil.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ScreenManager.h"
#include "PrefsManager.h"
#include "GameConstantsAndTypes.h"
stepmania/src/ScreenMachineOptions.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "ScreenMachineOptions.h"
#include "RageTextureManager.h"
#include "RageUtil.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ScreenManager.h"
#include "PrefsManager.h"
#include "GameConstantsAndTypes.h"
stepmania/src/ScreenMapControllers.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "InputMapper.h"
#include "GameManager.h"
#include "GameState.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ThemeManager.h"
stepmania/src/ScreenMusicScroll.h
+1 -1
View File
@@ -12,7 +12,7 @@
#include "Screen.h"
#include "Sprite.h"
#include "TransitionFade.h"
#include "RageSoundStream.h"
#include "RageSoundManager.h"
#include "MenuElements.h"
stepmania/src/ScreenNetworkWaiting.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "GameManager.h"
#include "RageLog.h"
#include "GameState.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ThemeManager.h"
#include "RageNetworkClient.h"
#include "NetGameState.h"
stepmania/src/ScreenOptions.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "ScreenOptions.h"
#include "RageTextureManager.h"
#include "RageUtil.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ScreenManager.h"
#include "PrefsManager.h"
#include "GameConstantsAndTypes.h"
stepmania/src/ScreenPrompt.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include "ScreenPrompt.h"
#include "PrefsManager.h"
#include "ScreenManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "ThemeManager.h"
stepmania/src/ScreenSandbox.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include "SDL_opengl.h"
#include "ScreenSandbox.h"
#include "ScreenManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "Quad.h"
stepmania/src/ScreenSelectCourse.cpp
+1 -2
View File
@@ -16,14 +16,13 @@
#include "PrefsManager.h"
#include "SongManager.h"
#include "GameManager.h"
#include "RageMusic.h"
#include "GameConstantsAndTypes.h"
#include "RageLog.h"
#include "InputMapper.h"
#include "InputQueue.h"
#include "AnnouncerManager.h"
#include "GameState.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "CodeDetector.h"
#include "ThemeManager.h"
stepmania/src/ScreenSelectDifficulty.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include "GameConstantsAndTypes.h"
#include "AnnouncerManager.h"
#include "GameState.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ThemeManager.h"
stepmania/src/ScreenSelectGame.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
*/
#include "ScreenSelectGame.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ScreenManager.h"
#include "PrefsManager.h"
#include "RageLog.h"
stepmania/src/ScreenSelectGroup.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "SongManager.h"
#include "AnnouncerManager.h"
#include "GameState.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ThemeManager.h"
#include <map>
stepmania/src/ScreenSelectMode.cpp
+1 -1
View File
@@ -12,7 +12,7 @@ Chris Danford
#include "ScreenSelectMode.h"
#include "ScreenManager.h"
#include "PrefsManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "GameManager.h"
stepmania/src/ScreenSelectMusic.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#include "PrefsManager.h"
#include "SongManager.h"
#include "GameManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "RageLog.h"
stepmania/src/ScreenSelectStyle.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include "ScreenSelectStyle.h"
#include "ScreenManager.h"
#include "PrefsManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "GameManager.h"
stepmania/src/ScreenSelectStyle5th.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include "ScreenSelectStyle5th.h"
#include "ScreenManager.h"
#include "PrefsManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "GameManager.h"
stepmania/src/ScreenSongOptions.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include "ScreenSongOptions.h"
#include "RageUtil.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ScreenManager.h"
#include "GameConstantsAndTypes.h"
#include "RageLog.h"
stepmania/src/ScreenStage.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include "Sprite.h"
#include "AnnouncerManager.h"
#include "GameState.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ThemeManager.h"
#include "RageDisplay.h"
stepmania/src/ScreenTextEntry.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "ScreenTextEntry.h"
#include "PrefsManager.h"
#include "ScreenManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ScreenTitleMenu.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
stepmania/src/ScreenTitleMenu.cpp
+2 -1
View File
@@ -24,7 +24,8 @@
#include "InputMapper.h"
#include "ThemeManager.h"
#include "SDL_Utils.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
const CString CHOICE_TEXT[ScreenTitleMenu::NUM_TITLE_MENU_CHOICES] = {
"GAME START",
stepmania/src/StepMania.cpp
-4
View File
@@ -18,7 +18,6 @@
#include "RageTextureManager.h"
#include "RageSoundBass.h"
#include "RageSoundManager.h"
#include "RageMusic.h"
#include "RageInput.h"
#include "RageTimer.h"
#include "RageException.h"
@@ -200,7 +199,6 @@ int main(int argc, char* argv[])
THEME = new ThemeManager;
SOUND = new RageSoundBass;
SOUNDMAN = new RageSoundManager(PREFSMAN->m_bSoundDrivers);
MUSIC = new RageSoundStream;
ANNOUNCER = new AnnouncerManager;
INPUTFILTER = new InputFilter;
INPUTMAPPER = new InputMapper;
@@ -295,7 +293,6 @@ int main(int argc, char* argv[])
SAFE_DELETE( THEME );
SAFE_DELETE( ANNOUNCER );
SAFE_DELETE( INPUTMAN );
SAFE_DELETE( MUSIC );
SAFE_DELETE( SOUND );
SAFE_DELETE( SOUNDMAN );
SAFE_DELETE( FONT );
@@ -431,7 +428,6 @@ static void GameLoop()
fDeltaTime /= 4;
TEXTUREMAN->Update( fDeltaTime );
MUSIC->Update( fDeltaTime );
SCREENMAN->Update( fDeltaTime );
CLIENT->Update( fDeltaTime );
SOUNDMAN->Update( fDeltaTime );
stepmania/src/StepMania.dsp
-8
View File
@@ -214,14 +214,6 @@ SOURCE=.\RageMovieTexture.h
# End Source File
# Begin Source File
SOURCE=.\RageMusic.cpp
# End Source File
# Begin Source File
SOURCE=.\RageMusic.h
# End Source File
# Begin Source File
SOURCE=.\RageNetworkClient.cpp
# End Source File
# Begin Source File
stepmania/src/StepMania.vcproj
-6
View File
@@ -1137,12 +1137,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
<File
RelativePath="RageMovieTextureHelper.h">
</File>
<File
RelativePath=".\RageMusic.cpp">
</File>
<File
RelativePath=".\RageMusic.h">
</File>
<File
RelativePath="RageNetworkClient.cpp">
</File>
stepmania/src/TransitionKeepAlive.cpp
+2 -2
View File
@@ -15,7 +15,7 @@
#include "RageUtil.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "RageMusic.h"
#include "RageSoundManager.h"
#include "ThemeManager.h"
#include "RageLog.h"
@@ -95,7 +95,7 @@ void TransitionKeepAlive::OpenWipingRight( ScreenMessage send_when_done )
void TransitionKeepAlive::OpenWipingLeft( ScreenMessage send_when_done )
{
if( STOP_MUSIC_ON_NEXT )
MUSIC->Stop();
SOUNDMAN->music->StopPlaying();
this->SetTransitionTime( KEEP_ALIVE_BACKWARD_TRANSITION_TIME );