fix merge
This commit is contained in:
@@ -666,7 +666,7 @@ void OptionRow::SetOptionIcon( PlayerNumber pn, const RString &sText, GameComman
|
|||||||
{
|
{
|
||||||
// update bullet
|
// update bullet
|
||||||
Message msg( "Refresh" );
|
Message msg( "Refresh" );
|
||||||
msg.SetParam( "GameCommand", gc );
|
msg.SetParam( "GameCommand", &gc );
|
||||||
m_sprBullet->HandleMessage( msg );
|
m_sprBullet->HandleMessage( msg );
|
||||||
if( m_OptionIcons[pn] != NULL )
|
if( m_OptionIcons[pn] != NULL )
|
||||||
m_OptionIcons[pn]->Set( pn, sText, false );
|
m_OptionIcons[pn]->Set( pn, sText, false );
|
||||||
|
|||||||
Reference in New Issue
Block a user