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

I wonder how the branches will look this time.

Browse Source
This commit is contained in:
Jason Felds
2011-02-13 18:13:06 -05:00
parent d6bdeb0499 0139f8e201
commit 54d973b18a
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/default/metrics.ini
+1 -1
View File
@@ -1755,7 +1755,7 @@ PercentP1Y=SCREEN_TOP+320
PercentP1OnCommand=visible,false PercentP1OnCommand=visible,false
PercentP1OffCommand= PercentP1OffCommand=
# #
PercentP2X=SCREEN_CENTER_X-160 PercentP2X=SCREEN_CENTER_X+160
PercentP2Y=SCREEN_TOP+320 PercentP2Y=SCREEN_TOP+320
PercentP2OnCommand=visible,false PercentP2OnCommand=visible,false
PercentP2OffCommand= PercentP2OffCommand=
src/Player.h
+1
View File
@@ -23,6 +23,7 @@ class NoteField;
class PlayerStageStats; class PlayerStageStats;
class JudgedRows; class JudgedRows;
// todo: replace these with a Message and MESSAGEMAN? -aj
AutoScreenMessage( SM_100Combo ); AutoScreenMessage( SM_100Combo );
AutoScreenMessage( SM_200Combo ); AutoScreenMessage( SM_200Combo );
AutoScreenMessage( SM_300Combo ); AutoScreenMessage( SM_300Combo );
src/ScreenGameplay.cpp
+1 -1
View File
@@ -2578,7 +2578,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
} }
else if( SM >= SM_100Combo && SM <= SM_1000Combo ) 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 ); PlayAnnouncer( ssprintf("gameplay %d combo",iCombo), 2 );
} }
else if( SM == SM_ComboStopped ) else if( SM == SM_ComboStopped )
src/ScreenHowToPlay.cpp
+5 -1
View File
@@ -4,6 +4,7 @@
#include "GameState.h" #include "GameState.h"
#include "Steps.h" #include "Steps.h"
#include "GameManager.h" #include "GameManager.h"
#include "NotesLoaderSM.h"
#include "NotesLoaderSSC.h" #include "NotesLoaderSSC.h"
#include "GameSoundManager.h" #include "GameSoundManager.h"
#include "Model.h" #include "Model.h"
@@ -132,7 +133,10 @@ void ScreenHowToPlay::Init()
ActorUtil::LoadAllCommandsAndSetXY( m_pLifeMeterBar, m_sName ); ActorUtil::LoadAllCommandsAndSetXY( m_pLifeMeterBar, m_sName );
m_pLifeMeterBar->FillForHowToPlay( NUM_W2S, NUM_MISSES ); 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(); m_Song.AddAutoGenNotes();
const Style* pStyle = GAMESTATE->GetCurrentStyle(); const Style* pStyle = GAMESTATE->GetCurrentStyle();