diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp index 89c78c93dd..ac875dcb76 100644 --- a/stepmania/src/MusicBannerWheel.cpp +++ b/stepmania/src/MusicBannerWheel.cpp @@ -84,7 +84,7 @@ MusicBannerWheel::MusicBannerWheel() else // theres a song already selected (i.e. they came back from gameplay)... { // find our song and change the currentPos to wherever it may be. - for(int i=0; im_pCurSong == arraySongs[i]) { @@ -104,7 +104,7 @@ MusicBannerWheel::MusicBannerWheel() /************ TODO: OPTIMIZE THIS: MUST!!!! ********************/ void MusicBannerWheel::LoadSongData() { - Song* pSong; + Song* pSong = NULL; CStringArray asGraphicPaths; if(MAXSONGSINBUFFER >= arraySongs.size() && SingleLoad != 1) // less than the MAXSONGSINBUFFER means we can get away with loading the lot in one go @@ -115,7 +115,7 @@ void MusicBannerWheel::LoadSongData() difference = MAXSONGSINBUFFER - arraySongs.size(); for(int i=0; i<=difference; i++) { - for(int c=0; cTrace( "val = %d", val ); + if( val < -16000 ) { JoystickButton b = (JoystickButton)(JOY_LEFT+2*axis); m_joyState[joy].button[b] = true; } + else if( val > +16000 ) + { + JoystickButton b = (JoystickButton)(JOY_RIGHT+2*axis); + m_joyState[joy].button[b] = true; + } } int iNumJoyHats = min(NUM_JOYSTICK_HATS,SDL_JoystickNumHats(pJoy)); diff --git a/stepmania/src/RageInput.h b/stepmania/src/RageInput.h index ad83c69f56..4684de4938 100644 --- a/stepmania/src/RageInput.h +++ b/stepmania/src/RageInput.h @@ -39,7 +39,8 @@ enum InputDevice { // button byte codes for directional pad enum JoystickButton { - JOY_LEFT = 0, JOY_RIGHT, JOY_UP, JOY_DOWN, + JOY_LEFT = 0, JOY_RIGHT, + JOY_UP, JOY_DOWN, JOY_Z_UP, JOY_Z_DOWN, JOY_Z_ROT_UP, JOY_Z_ROT_DOWN, JOY_HAT_LEFT, JOY_HAT_RIGHT, JOY_HAT_UP, JOY_HAT_DOWN, diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index 6ce601977b..fab5053f03 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -30,16 +30,16 @@ #include "InputMapper.h" #include "CodeDetector.h" -#define SCROLLING_LIST_X THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListX") -#define SCROLLING_LIST_Y THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListY") -#define PUMP_DIFF_X THEME->GetMetricI("ScreenEz2SelectMusic","PumpDifficultyX") -#define PUMP_DIFF_Y THEME->GetMetricI("ScreenEz2SelectMusic","PumpDifficultyY") +#define SCROLLING_LIST_X THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListX") +#define SCROLLING_LIST_Y THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListY") +#define PUMP_DIFF_X THEME->GetMetricF("ScreenEz2SelectMusic","PumpDifficultyX") +#define PUMP_DIFF_Y THEME->GetMetricF("ScreenEz2SelectMusic","PumpDifficultyY") #define HELP_TEXT THEME->GetMetric("ScreenSelectMusic","HelpText") #define TIMER_SECONDS THEME->GetMetricI("ScreenSelectMusic","TimerSeconds") #define METER_X( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("MeterP%dX",p+1)) #define METER_Y( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("MeterP%dY",p+1)) -#define GUIDE_X THEME->GetMetricF("ScreenSelectMode","GuideX") -#define GUIDE_Y THEME->GetMetricF("ScreenSelectMode","GuideY") +#define GUIDE_X THEME->GetMetricF("ScreenSelectMode","GuideX") +#define GUIDE_Y THEME->GetMetricF("ScreenSelectMode","GuideY") const ScreenMessage SM_GoToPrevScreen = ScreenMessage(SM_User+1); const ScreenMessage SM_GoToNextScreen = ScreenMessage(SM_User+2); diff --git a/stepmania/src/ScreenEz2SelectStyle.h b/stepmania/src/ScreenEz2SelectStyle.h index 47d2599910..1688569a88 100644 --- a/stepmania/src/ScreenEz2SelectStyle.h +++ b/stepmania/src/ScreenEz2SelectStyle.h @@ -51,7 +51,7 @@ protected: Sprite m_StyleListFrame; Sprite m_SelectedStyleFrame; - CArray m_aPossibleModeChoices; + vector m_aPossibleModeChoices; ScrollingList m_ScrollingList; void RefreshModeChoices(); diff --git a/stepmania/src/ScreenLoading.cpp b/stepmania/src/ScreenLoading.cpp deleted file mode 100644 index be07621c35..0000000000 --- a/stepmania/src/ScreenLoading.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "stdafx.h" -/* ------------------------------------------------------------------------------ - Class: ScreenLoading - - Desc: See header. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ - -#include "ScreenLoading.h" -#include "GameState.h" - -ScreenLoading::ScreenLoading() -{ - m_sprLoading.Load( THEME->GetPathTo(GRAPHIC_LOADING) ); - m_sprLoading.SetXY( CENTER_X, CENTER_Y ); - this->AddSubActor( &m_sprLoading ); - - m_textMessage.Load( THEME->GetPathTo(FONT_NORMAL) ); - m_textMessage.SetXY( CENTER_X, CENTER_Y ); - this->AddSubActor( &m_textMessage ); -} - -void ScreenLoading::DrawPrimitives() -{ - m_textMessage.SetText( GAMESTATE->m_sLoadingMessage ); - - Screen::DrawPrimitives(); -} diff --git a/stepmania/src/ScreenLoading.h b/stepmania/src/ScreenLoading.h deleted file mode 100644 index 5b0916263c..0000000000 --- a/stepmania/src/ScreenLoading.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef SCREENLOADING_H -#define SCREENLOADING_H -/* ------------------------------------------------------------------------------ - Class: ScreenLoading - - Desc: Shows while game loads. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ - -#include "Screen.h" -#include "BitmapText.h" -#include "Sprite.h" - -class ScreenLoading : public Screen -{ -public: - ScreenLoading(); - - virtual void DrawPrimitives(); - -protected: - BitmapText m_textMessage; - Sprite m_sprLoading; - -}; - - -#endif diff --git a/stepmania/src/ScreenTestSound.cpp b/stepmania/src/ScreenTestSound.cpp index 52ba88d03c..4dcff85420 100644 --- a/stepmania/src/ScreenTestSound.cpp +++ b/stepmania/src/ScreenTestSound.cpp @@ -23,6 +23,7 @@ ScreenTestSound::ScreenTestSound() { + int i; this->AddChild(&HEEEEEEEEELP); HEEEEEEEEELP.SetXY(450, 400); @@ -35,7 +36,7 @@ ScreenTestSound::ScreenTestSound() "a Set autostop\n" "c Set continue"); - for(int i = 0; i < nsounds; ++i) + for(i = 0; i < nsounds; ++i) { this->AddChild(&s[i].txt); s[i].txt.LoadFromFont( THEME->GetPathTo("Fonts","normal") ); @@ -62,7 +63,7 @@ s[0].s.SetPlaybackRate(1.20f); //s[0].s.Play(); selected = 0; - for(int i = 0; i < nsounds; ++i) + for(i = 0; i < nsounds; ++i) UpdateText(i); } diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 497bec0de1..6250f63493 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -185,6 +185,7 @@ ScreenTitleMenu::~ScreenTitleMenu() void ScreenTitleMenu::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) { // LOG->Trace( "ScreenTitleMenu::Input()" ); + LOG->Trace( "ScreenTitleMenu::Input( %d-%d )", DeviceI.device, DeviceI.button ); // debugging gameport joystick problem if( m_Fade.IsClosing() ) return; diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 66b38d2731..3ebcc614c4 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -57,7 +57,7 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /pdb:none # Begin Special Build Tool IntDir=.\../Release6 -TargetDir=\temp\stepmania +TargetDir=\stepmania\stepmania TargetName=StepMania SOURCE="$(InputPath)" PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ @@ -92,7 +92,7 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # Begin Special Build Tool IntDir=.\../Debug6 -TargetDir=\temp\stepmania +TargetDir=\stepmania\stepmania TargetName=StepMania-debug SOURCE="$(InputPath)" PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ @@ -223,14 +223,6 @@ SOURCE=.\RageMovieTexture.h # End Source File # Begin Source File -SOURCE=.\RageNetworkClient.cpp -# End Source File -# Begin Source File - -SOURCE=.\RageNetworkClient.h -# End Source File -# Begin Source File - SOURCE=.\RageSound.cpp # End Source File # Begin Source File @@ -1272,6 +1264,14 @@ SOURCE=.\Screen.h # End Source File # Begin Source File +SOURCE=.\ScreenAlbums.cpp +# End Source File +# Begin Source File + +SOURCE=.\ScreenAlbums.h +# End Source File +# Begin Source File + SOURCE=.\ScreenAppearanceOptions.cpp # End Source File # Begin Source File @@ -1280,6 +1280,14 @@ SOURCE=.\ScreenAppearanceOptions.h # End Source File # Begin Source File +SOURCE=.\ScreenAttract.cpp +# End Source File +# Begin Source File + +SOURCE=.\ScreenAttract.h +# End Source File +# Begin Source File + SOURCE=.\ScreenCaution.cpp # End Source File # Begin Source File @@ -1288,6 +1296,18 @@ SOURCE=.\ScreenCaution.h # End Source File # Begin Source File +SOURCE=.\ScreenCompany.h +# End Source File +# Begin Source File + +SOURCE=.\ScreenDemonstration.cpp +# End Source File +# Begin Source File + +SOURCE=.\ScreenDemonstration.h +# End Source File +# Begin Source File + SOURCE=.\ScreenEdit.cpp # End Source File # Begin Source File @@ -1361,7 +1381,11 @@ SOURCE=.\ScreenGraphicOptions.h # End Source File # Begin Source File -SOURCE=.\ScreenHowToPlay.cpp +SOURCE=.\ScreenHighScores.cpp +# End Source File +# Begin Source File + +SOURCE=.\ScreenHighScores.h # End Source File # Begin Source File @@ -1377,6 +1401,18 @@ SOURCE=.\ScreenInputOptions.h # End Source File # Begin Source File +SOURCE=.\ScreenInstructions.cpp +# End Source File +# Begin Source File + +SOURCE=.\ScreenInstructions.h +# End Source File +# Begin Source File + +SOURCE=.\ScreenLogo.h +# End Source File +# Begin Source File + SOURCE=.\ScreenMachineOptions.cpp # End Source File # Begin Source File @@ -1401,6 +1437,10 @@ SOURCE=.\ScreenMapControllers.h # End Source File # Begin Source File +SOURCE=.\ScreenMemoryCard.h +# End Source File +# Begin Source File + SOURCE=.\ScreenMessage.h # End Source File # Begin Source File @@ -1413,14 +1453,6 @@ SOURCE=.\ScreenMusicScroll.h # End Source File # Begin Source File -SOURCE=.\ScreenNetworkWaiting.cpp -# End Source File -# Begin Source File - -SOURCE=.\ScreenNetworkWaiting.h -# End Source File -# Begin Source File - SOURCE=.\ScreenOptions.cpp # End Source File # Begin Source File @@ -1571,6 +1603,14 @@ SOURCE=.\ScreenTitleMenu.cpp SOURCE=.\ScreenTitleMenu.h # End Source File +# Begin Source File + +SOURCE=.\ScreenUnlock.h +# End Source File +# Begin Source File + +SOURCE=.\ScreenWarning.h +# End Source File # End Group # Begin Group "Global Singletons" diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index fdaa2a53d6..451872142b 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -1155,21 +1155,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ - - - - - - - - - -