From 0975f8c39c9405f48845e4aa29bde47489b243df Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 13 Feb 2011 16:55:00 -0600 Subject: [PATCH 1/4] small fixes --- Themes/default/metrics.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 4d1a6f9994..a55b777546 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1755,7 +1755,7 @@ PercentP1Y=SCREEN_TOP+320 PercentP1OnCommand=visible,false PercentP1OffCommand= # -PercentP2X=SCREEN_CENTER_X-160 +PercentP2X=SCREEN_CENTER_X+160 PercentP2Y=SCREEN_TOP+320 PercentP2OnCommand=visible,false PercentP2OffCommand= From e4002ab57f91e2f7a6749090480a1719d085a4c8 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 13 Feb 2011 16:55:16 -0600 Subject: [PATCH 2/4] comment --- src/Player.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Player.h b/src/Player.h index dbd4caf0bf..82118d95ce 100644 --- a/src/Player.h +++ b/src/Player.h @@ -23,6 +23,7 @@ class NoteField; class PlayerStageStats; class JudgedRows; +// todo: replace these with a Message and MESSAGEMAN? -aj AutoScreenMessage( SM_100Combo ); AutoScreenMessage( SM_200Combo ); AutoScreenMessage( SM_300Combo ); From ce043d595be248c2c98a779f55548ec6071dbf77 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 13 Feb 2011 16:55:51 -0600 Subject: [PATCH 3/4] allow themers to use .sm files as well as .ssc files for ScreenHowToPlay. --- src/ScreenHowToPlay.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ScreenHowToPlay.cpp b/src/ScreenHowToPlay.cpp index 0ffbadd34c..16ddba07a2 100644 --- a/src/ScreenHowToPlay.cpp +++ b/src/ScreenHowToPlay.cpp @@ -4,6 +4,7 @@ #include "GameState.h" #include "Steps.h" #include "GameManager.h" +#include "NotesLoaderSM.h" #include "NotesLoaderSSC.h" #include "GameSoundManager.h" #include "Model.h" @@ -132,7 +133,10 @@ void ScreenHowToPlay::Init() ActorUtil::LoadAllCommandsAndSetXY( m_pLifeMeterBar, m_sName ); m_pLifeMeterBar->FillForHowToPlay( NUM_W2S, NUM_MISSES ); - SSCLoader::LoadFromSSCFile( THEME->GetPathO(m_sName, "steps"), m_Song, false ); + // Allow themers to use .ssc and .sm files. -aj + bool bLoadedSSCFile = SSCLoader::LoadFromSSCFile( THEME->GetPathO(m_sName, "steps"), m_Song, false ); + if( !bLoadedSSCFile ) + SMLoader::LoadFromSMFile( THEME->GetPathO(m_sName, "steps"), m_Song, false ); m_Song.AddAutoGenNotes(); const Style* pStyle = GAMESTATE->GetCurrentStyle(); From 0139f8e201dd42cda60d15c0113a12113432addd Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 13 Feb 2011 16:57:31 -0600 Subject: [PATCH 4/4] small changes --- src/ScreenGameplay.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp index 4614d594f2..7978ab8b8c 100644 --- a/src/ScreenGameplay.cpp +++ b/src/ScreenGameplay.cpp @@ -1856,7 +1856,7 @@ void ScreenGameplay::Update( float fDeltaTime ) case PLAY_MODE_RAVE: if( GAMESTATE->OneIsHot() ) PlayAnnouncer( "gameplay comment hot", SECONDS_BETWEEN_COMMENTS ); - else if( GAMESTATE->AllAreInDangerOrWorse() ) + else if( GAMESTATE->AllAreInDangerOrWorse() ) PlayAnnouncer( "gameplay comment danger", SECONDS_BETWEEN_COMMENTS ); else PlayAnnouncer( "gameplay comment good", SECONDS_BETWEEN_COMMENTS ); @@ -2578,7 +2578,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) } else if( SM >= SM_100Combo && SM <= SM_1000Combo ) { - int iCombo = (SM-SM_100Combo+1) * 100; + int iCombo = ( SM-(SM_100Combo+1) ) * 100; PlayAnnouncer( ssprintf("gameplay %d combo",iCombo), 2 ); } else if( SM == SM_ComboStopped )