From 6f49d80e6eba59e61fa1301880e90603e153210b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 3 May 2004 01:37:49 +0000 Subject: [PATCH] fix text info not displayed immediately the second time the editor is entered in the same session fix unresponsive text info --- stepmania/src/ScreenEdit.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 525125a3d5..0ebab9a0d1 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -97,6 +97,7 @@ const ScreenMessage SM_BackFromInsertAttackModifiers= (ScreenMessage)(SM_User+10 const ScreenMessage SM_BackFromPrefs = (ScreenMessage)(SM_User+11); const ScreenMessage SM_BackFromCourseModeMenu = (ScreenMessage)(SM_User+12); const ScreenMessage SM_DoReloadFromDisk = (ScreenMessage)(SM_User+13); +const ScreenMessage SM_DoUpdateTextInfo = (ScreenMessage)(SM_User+14); const CString HELP_TEXT = "Up/Down:\n change beat\n" @@ -377,6 +378,8 @@ ScreenEdit::ScreenEdit( CString sName ) : Screen( sName ) m_soundMusic.Load(m_pSong->GetMusicPath()); m_soundAssistTick.Load( THEME->GetPathToS("ScreenEdit assist tick") ); + + this->HandleScreenMessage( SM_DoUpdateTextInfo ); } ScreenEdit::~ScreenEdit() @@ -540,14 +543,6 @@ void ScreenEdit::Update( float fDeltaTime ) m_NoteFieldEdit.Update( fDeltaTime ); PlayTicks(); - - static float fUpdateCounter = 0; - fUpdateCounter -= fDeltaTime; - if( fUpdateCounter < 0 ) - { - fUpdateCounter = 0.5; - UpdateTextInfo(); - } } void ScreenEdit::UpdateTextInfo() @@ -661,6 +656,8 @@ void ScreenEdit::Input( const DeviceInput& DeviceI, const InputEventType type, c case MODE_PLAYING: InputPlay( DeviceI, type, GameI, MenuI, StyleI ); break; default: ASSERT(0); } + + UpdateTextInfo(); } @@ -1455,6 +1452,11 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM ) break; } + case SM_DoUpdateTextInfo: + this->PostScreenMessage( SM_DoUpdateTextInfo, 0.5f ); + UpdateTextInfo(); + break; + case SM_GainFocus: /* We do this ourself. */ SOUND->HandleSongTimer( false );