themeable system message animation

This commit is contained in:
Chris Danford
2005-05-09 09:49:13 +00:00
parent e33ffbe777
commit 17b6d15d79
3 changed files with 11 additions and 13 deletions
+3 -3
View File
@@ -2252,9 +2252,9 @@ Class=ScreenSystemLayer
StatsX=SCREEN_RIGHT-8
StatsY=SCREEN_TOP+10
StatsOnCommand=horizalign,right;vertalign,top;zoom,0.5;shadowlength,2
MessageX=SCREEN_LEFT+4
MessageY=SCREEN_TOP+4
MessageOnCommand=horizalign,left;vertalign,top;zoom,0.8;shadowlength,2
MessageX=0
MessageY=0
MessageOnCommand=finishtweening;horizalign,left;vertalign,top;x,SCREEN_LEFT+4;y,SCREEN_TOP+4;zoom,0.8;shadowlength,2;diffusealpha,1;x,-SCREEN_WIDTH;linear,0.5;addx,SCREEN_WIDTH;sleep,5;linear,0.5;diffusealpha,0
TimeX=SCREEN_LEFT+4
TimeY=SCREEN_TOP+40
TimeOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0;diffuse,1,0,1,1
+7 -9
View File
@@ -92,7 +92,8 @@ void ScreenSystemLayer::ReloadCreditsText()
{
m_textMessage.LoadFromFont( THEME->GetPathF("ScreenSystemLayer","message") );
m_textMessage.SetName( "Message" );
SET_XY_AND_ON_COMMAND( m_textMessage );
SET_XY_AND_ON_COMMAND( m_textMessage );
m_textMessage.SetHidden( true );
m_textStats.LoadFromFont( THEME->GetPathF("ScreenSystemLayer","stats") );
m_textStats.SetName( "Stats" );
@@ -218,19 +219,16 @@ void ScreenSystemLayer::HandleMessage( const CString &sMessage )
}
else if( sMessage == "SystemMessage" )
{
m_textMessage.SetHidden( false );
m_textMessage.SetText( SCREENMAN->GetCurrentSystemMessage() );
ActorCommands c = ActorCommands( "finishtweening;diffusealpha,1;addx,-640;linear,0.5;addx,+640;sleep,5;linear,0.5;diffusealpha,0" );
m_textMessage.RunCommands( c );
m_textMessage.PlayCommand( "On" );
}
else if( sMessage == "SystemMessageNoAnimate" )
{
m_textMessage.FinishTweening();
m_textMessage.SetHidden( false );
m_textMessage.SetText( SCREENMAN->GetCurrentSystemMessage() );
m_textMessage.SetX( 4 );
m_textMessage.SetDiffuseAlpha( 1 );
m_textMessage.BeginTweening( 5 );
m_textMessage.BeginTweening( 0.5f );
m_textMessage.SetDiffuse( RageColor(1,1,1,0) );
m_textMessage.PlayCommand( "On" );
m_textMessage.FinishTweening();
}
Screen::HandleMessage( sMessage );
}
+1 -1
View File
@@ -1295,7 +1295,7 @@ bool HandleGlobalInputs( DeviceInput DeviceI, InputEventType type, GameInput Gam
if( !GAMESTATE->m_bIsOnSystemMenu )
{
SCREENMAN->DeletePreparedScreens();
SCREENMAN->SystemMessage( "OPERATOR" );
SCREENMAN->SystemMessage( "Service switch pressed" );
GAMESTATE->Reset();
SCREENMAN->SetNewScreen( "ScreenOptionsMenu" );
}