move Font load for item length testing inside of OptionsRow

This commit is contained in:
Chris Danford
2005-02-25 16:52:33 +00:00
parent d004d5cbfa
commit 03e3ba7609
3 changed files with 7 additions and 11 deletions
-8
View File
@@ -15,8 +15,6 @@
#include "Style.h"
#include "ScreenDimensions.h"
#include "Command.h"
#include "FontManager.h"
#include "Font.h"
/*
@@ -144,8 +142,6 @@ void ScreenOptions::InitMenu( InputMode im, const vector<OptionRowDefinition> &v
m_bShowUnderlines = bShowUnderlines;
Font* pFont = FONT->LoadFont( THEME->GetPathF(m_sName,"item") );
for( unsigned r=0; r<vDefs.size(); r++ ) // foreach row
{
m_Rows.push_back( new OptionRow() );
@@ -165,15 +161,11 @@ void ScreenOptions::InitMenu( InputMode im, const vector<OptionRowDefinition> &v
const float fY = ROW_Y.GetValue( pos );
row.AfterImportOptions(
pFont,
GetExplanationTitle( r ),
fY
);
}
FONT->UnloadFont( pFont );
pFont = NULL;
m_sprPage.Load( THEME->GetPathG(m_sName,"page") );
m_sprPage->SetName( "Page" );
SET_XY_AND_ON_COMMAND( m_sprPage );