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

fix reloading commands; don't rename and reload actors mid-screen

Browse Source
This commit is contained in:
Glenn Maynard
2007-03-03 04:45:33 +00:00
parent 9c27ca1139
commit 0c056ca597
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+11
View File
@@ -908,6 +908,17 @@ DifficultyP2ReverseX=SCREEN_CENTER_X+254
DifficultyP2ReverseY=SCREEN_CENTER_Y-196 DifficultyP2ReverseY=SCREEN_CENTER_Y-196
DifficultyP2ReverseOnCommand=croptop,0.5;addx,200;linear,0.5;addx,-200 DifficultyP2ReverseOnCommand=croptop,0.5;addx,200;linear,0.5;addx,-200
DifficultyP2ReverseOffCommand=croptop,0.5;linear,0.5;addx,200 DifficultyP2ReverseOffCommand=croptop,0.5;linear,0.5;addx,200
DifficultyP1OnCommand=
DifficultyP1OffCommand=linear,0.5;addx,-200
DifficultyP1SetReverseCommand=x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200;cropbottom,0;croptop,0.5
DifficultyP1SetNoReverseCommand=x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200;cropbottom,0.5;croptop,0
DifficultyP2OnCommand=
DifficultyP2OffCommand=linear,0.5;addx,200
DifficultyP2SetReverseCommand=x,SCREEN_CENTER_X+254;y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200;cropbottom,0;croptop,0.5
DifficultyP2SetNoReverseCommand=x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200;cropbottom,0.5;croptop,0
LyricsX=SCREEN_CENTER_X+0 LyricsX=SCREEN_CENTER_X+0
LyricsY=SCREEN_CENTER_Y+160 LyricsY=SCREEN_CENTER_Y+160
LyricsReverseX=SCREEN_CENTER_X+0 LyricsReverseX=SCREEN_CENTER_X+0
stepmania/src/ScreenGameplay.cpp
+3 -6
View File
@@ -646,8 +646,8 @@ void ScreenGameplay::Init()
ASSERT( pi->m_pDifficultyIcon == NULL ); ASSERT( pi->m_pDifficultyIcon == NULL );
pi->m_pDifficultyIcon = new DifficultyIcon; pi->m_pDifficultyIcon = new DifficultyIcon;
pi->m_pDifficultyIcon->Load( THEME->GetPathG(m_sName,ssprintf("difficulty icons %dx%d",NUM_PLAYERS,NUM_Difficulty)) ); pi->m_pDifficultyIcon->Load( THEME->GetPathG(m_sName,ssprintf("difficulty icons %dx%d",NUM_PLAYERS,NUM_Difficulty)) );
ActorUtil::LoadAllCommands( *pi->m_pDifficultyIcon, m_sName ); pi->m_pDifficultyIcon->SetName( ssprintf("Difficulty%s",pi->GetName().c_str()) );
/* Position it in LoadNextSong. */ LOAD_ALL_COMMANDS( pi->m_pDifficultyIcon );
this->AddChild( pi->m_pDifficultyIcon ); this->AddChild( pi->m_pDifficultyIcon );
// switch( GAMESTATE->m_PlayMode ) // switch( GAMESTATE->m_PlayMode )
@@ -1113,10 +1113,7 @@ void ScreenGameplay::LoadNextSong()
bool bReverse = pi->GetPlayerState()->m_PlayerOptions.GetCurrent().m_fScrolls[PlayerOptions::SCROLL_REVERSE] == 1; bool bReverse = pi->GetPlayerState()->m_PlayerOptions.GetCurrent().m_fScrolls[PlayerOptions::SCROLL_REVERSE] == 1;
if( pi->m_pDifficultyIcon ) if( pi->m_pDifficultyIcon )
{ pi->m_pDifficultyIcon->PlayCommand( bReverse? "SetReverse":"SetNoReverse" );
pi->m_pDifficultyIcon->SetName( ssprintf("Difficulty%s%s",pi->GetName().c_str(),bReverse?"Reverse":"") );
LOAD_ALL_COMMANDS_AND_SET_XY( pi->m_pDifficultyIcon );
}
} }