From b1396c186a4a9f7ccdda56f97b463a707cb4f647 Mon Sep 17 00:00:00 2001 From: Kevin Slaughter Date: Mon, 19 May 2003 08:18:21 +0000 Subject: [PATCH] Fix ScreenHowToPlay:: Now displays until all the hard-coded steps are gone (SecondsToShow metric), and added into Player.cpp a value to show/hide judgment messages (miss/perfect etc*). This is turned OFF by default so everything still shows the judgment, except for ScreenHowToPlay --- stepmania/TODO.miryokuteki | 9 ++++++++- stepmania/Themes/default/metrics.ini | 3 ++- stepmania/src/NoteData.cpp | 12 ++++++++++-- stepmania/src/NoteData.h | 6 +++++- stepmania/src/Player.cpp | 4 ++-- stepmania/src/Player.h | 1 + stepmania/src/ScreenHowToPlay.cpp | 15 ++++++++++----- stepmania/src/StepMania.dsp | 10 +++++----- stepmania/src/song.h | 3 +++ 9 files changed, 46 insertions(+), 17 deletions(-) diff --git a/stepmania/TODO.miryokuteki b/stepmania/TODO.miryokuteki index 601484a5a9..079e9e8710 100644 --- a/stepmania/TODO.miryokuteki +++ b/stepmania/TODO.miryokuteki @@ -2,11 +2,18 @@ // Miryokuteki's Todo/Done Record // //////////////////////////////////// -// Last Updated May 2nd, 2003 +// Last Updated May 9th, 2003 Todo List: ** Find a way to get the length of a movie being played, so ScreenIntroMovie does not have to have a pre-determined length (I.e: exits when the movie is finished playing) +Done as of 05/09/03: + ** Implemented a complete MAX2 style unlock system. + + + + + Done as of 05/02/03: ** Added more scripting to SSDEX, now supporting icon bar/icons/text/pic/info scripting. Having small probs with the highlight bar for each player, scripting-wise. Will work on this later diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 0544d90568..3e34951465 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1,4 +1,4 @@ -// Possible NextScreen names: +// Possible NextScreen names: // - ScreenCaution // - ScreenEz2SelectPlayer // - ScreenSelectMode @@ -1872,6 +1872,7 @@ NextScreen=ScreenHowToPlay [ScreenHowToPlay] NextScreen=ScreenDemonstration ScrollBPM=100 +SecondsToShow=40 [ScreenDemonstration] SecondsToShow=30 diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp index 712d9a4bae..198b3b27f1 100644 --- a/stepmania/src/NoteData.cpp +++ b/stepmania/src/NoteData.cpp @@ -53,9 +53,14 @@ void NoteData::SetNumTracks( int iNewNumTracks ) for( int t=0; tStopTweening()? -glenn */ m_Judgment.StopTweening(); -// m_Combo.Reset(); // don't reset combos between songs in a course! m_Combo.Init( pn ); m_Judgment.Reset(); @@ -325,7 +325,7 @@ void Player::DrawPrimitives() if( fTilt != 0 ) DISPLAY->ExitPerspective(); - m_Judgment.Draw(); + if (m_bShowJudgment) { m_Judgment.Draw(); } for( int c=0; cGetMetricF("ScreenHowToPlay","ScrollBPM") +#define SECONDS_TO_SHOW THEME->GetMetricF("ScreenHowToPlay","SecondsToShow") ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay") { @@ -64,22 +65,26 @@ ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay") m_pSong = new Song; m_pSong->AddBPMSegment( BPMSegment(0.0,BPMSPEED) ); - m_pSong->AddStopSegment( StopSegment(12,2) ); + m_pSong->AddStopSegment( StopSegment(15,2) ); m_pSong->AddStopSegment( StopSegment(16,2) ); m_pSong->AddStopSegment( StopSegment(20,2) ); m_pSong->AddStopSegment( StopSegment(24,2) ); m_pSong->AddStopSegment( StopSegment(28,2) ); + GAMESTATE->m_pCurSong = m_pSong; GAMESTATE->m_bPastHereWeGo = true; - - m_Player.Load( PLAYER_1, pND, NULL, NULL, NULL, NULL ); GAMESTATE->m_PlayerController[PLAYER_1] = PC_AUTOPLAY; + m_Player.Load( PLAYER_1, pND, &m_LifeMeter, NULL, NULL, NULL ); + m_Player.SetX( 480 ); + m_Player.m_bShowJudgment = false; this->AddChild( &m_Player ); delete pND; m_fFakeSecondsIntoSong = 0; + this->ClearMessageQueue(); + this->PostScreenMessage( SM_BeginFadingOut, SECONDS_TO_SHOW ); } ScreenHowToPlay::~ScreenHowToPlay() @@ -91,6 +96,6 @@ void ScreenHowToPlay::Update( float fDelta ) { m_fFakeSecondsIntoSong += fDelta; GAMESTATE->UpdateSongPosition( m_fFakeSecondsIntoSong ); - + ScreenAttract::Update( fDelta ); -} \ No newline at end of file +} diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 31f2d8766a..89ad6cfeda 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -1,5 +1,5 @@ # Microsoft Developer Studio Project File - Name="StepMania" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 60000 +# Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 @@ -57,10 +57,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /pdb:none # Begin Special Build Tool IntDir=.\../Release6 -TargetDir=\stepmania\stepmania +TargetDir=\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 @@ -92,10 +92,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # Begin Special Build Tool IntDir=.\../Debug6 -TargetDir=\stepmania\stepmania +TargetDir=\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 diff --git a/stepmania/src/song.h b/stepmania/src/song.h index 815446b04c..743dc80c2e 100644 --- a/stepmania/src/song.h +++ b/stepmania/src/song.h @@ -75,6 +75,9 @@ public: Song(); ~Song(); + bool m_bIsForBM; // If true, we read the data in differantly, for BeatMania + + bool LoadWithoutCache( CString sDir ); NotesLoader *MakeLoader( CString sDir ) const;