Don't pass transform functions through a string metric; read it as
a Lua expression directly.
This commit is contained in:
@@ -155,7 +155,7 @@ void ScreenSelectMaster::Init()
|
|||||||
m_Scroller[*p].SetLoop( LOOP_SCROLLER );
|
m_Scroller[*p].SetLoop( LOOP_SCROLLER );
|
||||||
m_Scroller[*p].SetNumItemsToDraw( SCROLLER_NUM_ITEMS_TO_DRAW );
|
m_Scroller[*p].SetNumItemsToDraw( SCROLLER_NUM_ITEMS_TO_DRAW );
|
||||||
m_Scroller[*p].Load2();
|
m_Scroller[*p].Load2();
|
||||||
m_Scroller[*p].SetTransformFromExpression( SCROLLER_TRANSFORM );
|
m_Scroller[*p].SetTransformFromReference( SCROLLER_TRANSFORM );
|
||||||
m_Scroller[*p].SetSecondsPerItem( SCROLLER_SECONDS_PER_ITEM );
|
m_Scroller[*p].SetSecondsPerItem( SCROLLER_SECONDS_PER_ITEM );
|
||||||
m_Scroller[*p].SetNumSubdivisions( SCROLLER_SUBDIVISIONS );
|
m_Scroller[*p].SetNumSubdivisions( SCROLLER_SUBDIVISIONS );
|
||||||
m_Scroller[*p].SetName( "Scroller"+PLAYER_APPEND_NO_SPACE(*p) );
|
m_Scroller[*p].SetName( "Scroller"+PLAYER_APPEND_NO_SPACE(*p) );
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ protected:
|
|||||||
ThemeMetric<bool> ALLOW_REPEATING_INPUT;
|
ThemeMetric<bool> ALLOW_REPEATING_INPUT;
|
||||||
ThemeMetric<float> SCROLLER_SECONDS_PER_ITEM;
|
ThemeMetric<float> SCROLLER_SECONDS_PER_ITEM;
|
||||||
ThemeMetric<float> SCROLLER_NUM_ITEMS_TO_DRAW;
|
ThemeMetric<float> SCROLLER_NUM_ITEMS_TO_DRAW;
|
||||||
ThemeMetric<RString> SCROLLER_TRANSFORM;
|
ThemeMetric<LuaReference> SCROLLER_TRANSFORM;
|
||||||
ThemeMetric<int> SCROLLER_SUBDIVISIONS;
|
ThemeMetric<int> SCROLLER_SUBDIVISIONS;
|
||||||
ThemeMetric<RString> DEFAULT_CHOICE;
|
ThemeMetric<RString> DEFAULT_CHOICE;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user