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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenGameplayLesson.cpp
+12 -11
View File
@@ -15,8 +15,8 @@ ScreenGameplayLesson::ScreenGameplayLesson()
void ScreenGameplayLesson::Init()
{
ASSERT( GAMESTATE->GetCurrentStyle(GAMESTATE->GetMasterPlayerNumber()) != NULL );
ASSERT( GAMESTATE->m_pCurSong != NULL );
ASSERT( GAMESTATE->GetCurrentStyle(GAMESTATE->GetMasterPlayerNumber()) != nullptr );
ASSERT( GAMESTATE->m_pCurSong != nullptr );
/* Now that we've set up, init the base class. */
ScreenGameplayNormal::Init();
@@ -33,24 +33,25 @@ void ScreenGameplayLesson::Init()
vector<RString> vs;
GetDirListing( sDir+"Page*", vs, true, true );
m_vPages.resize( vs.size() );
FOREACH( RString, vs, s )
int i = 0;
for (RString const &s : vs)
{
int i = s - vs.begin();
AutoActor &aa = m_vPages[i];
LuaThreadVariable iIndex( "PageIndex", LuaReference::Create(i) );
LuaThreadVariable iIndex( "PageIndex", LuaReference::Create(i++) );
LuaThreadVariable iPages( "NumPages", LuaReference::Create( (int)vs.size() ) );
aa.Load( *s );
aa.Load( s );
aa->SetDrawOrder( DRAW_ORDER_OVERLAY+1 );
this->AddChild( aa );
}
FOREACH( AutoActor, m_vPages, aa )
i = 0;
for (AutoActor &aa : m_vPages)
{
bool bIsFirst = aa == m_vPages.begin();
(*aa)->PlayCommand( bIsFirst ? "Show" : "Hide" );
(*aa)->PlayCommand( "On" );
bool bIsFirst = (i++ == 0);
aa->PlayCommand( bIsFirst ? "Show" : "Hide" );
aa->PlayCommand( "On" );
}
// Reset stage number (not relevant in lessons)