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

Revert "Loops with unused variables? Wonder why."

Browse Source 
This reverts commit c3ae23939a.
This commit is contained in:
Jason Felds
2013-05-02 21:48:32 -04:00
parent 9607f013a0
commit fe0c9f4c6f
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenDebugOverlay.cpp
+7 -8
View File
@@ -256,9 +256,10 @@ void ScreenDebugOverlay::Init()
m_textHeader.SetText( DEBUG_MENU ); m_textHeader.SetText( DEBUG_MENU );
this->AddChild( &m_textHeader ); this->AddChild( &m_textHeader );
int iPage = 0; FOREACH_CONST( RString, m_asPages, s )
for (RString const &s : m_asPages)
{ {
int iPage = s - m_asPages.begin();
DeviceInput di; DeviceInput di;
bool b = GetKeyFromMap( g_Mappings.pageButton, iPage, di ); bool b = GetKeyFromMap( g_Mappings.pageButton, iPage, di );
ASSERT( b ); ASSERT( b );
@@ -271,13 +272,12 @@ void ScreenDebugOverlay::Init()
LOAD_ALL_COMMANDS_AND_ON_COMMAND( p ); LOAD_ALL_COMMANDS_AND_ON_COMMAND( p );
// todo: Y value is still hardcoded. -aj // todo: Y value is still hardcoded. -aj
p->SetXY( PAGE_START_X+iPage*PAGE_SPACING_X, SCREEN_TOP+20 ); p->SetXY( PAGE_START_X+iPage*PAGE_SPACING_X, SCREEN_TOP+20 );
p->SetText( s + " (" + sButton + ")" ); p->SetText( *s + " (" + sButton + ")" );
m_vptextPages.push_back( p ); m_vptextPages.push_back( p );
this->AddChild( p ); this->AddChild( p );
++iPage;
} }
for (unsigned unused = 0; unused < g_pvpSubscribers->size(); ++unused) FOREACH_CONST( IDebugLine*, *g_pvpSubscribers, p )
{ {
{ {
BitmapText *bt = new BitmapText; BitmapText *bt = new BitmapText;
@@ -350,11 +350,10 @@ void ScreenDebugOverlay::Update( float fDeltaTime )
void ScreenDebugOverlay::UpdateText() void ScreenDebugOverlay::UpdateText()
{ {
int iPage = 0; FOREACH_CONST( RString, m_asPages, s )
for (unsigned unused = 0; unused < m_asPages.size(); ++unused)
{ {
int iPage = s - m_asPages.begin();
m_vptextPages[iPage]->PlayCommand( (iPage == m_iCurrentPage) ? "GainFocus" : "LoseFocus" ); m_vptextPages[iPage]->PlayCommand( (iPage == m_iCurrentPage) ? "GainFocus" : "LoseFocus" );
++iPage;
} }
// todo: allow changing of various spacing/location things -aj // todo: allow changing of various spacing/location things -aj