actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't adjust time during rendering; it causes ugly glitches in the BGM

Browse Source 
and effects as RageTimer tries to compensate for the wildly changing
time
This commit is contained in:
Glenn Maynard
2004-05-27 01:05:14 +00:00
parent 85992e6657
commit b8c4c6abcc
2 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSetTime.cpp
+37 -9
View File
@@ -77,6 +77,7 @@ ScreenSetTime::ScreenSetTime( CString sClassName ) : ScreenWithMenuElements( sCl
this->AddChild( &value ); this->AddChild( &value );
} }
m_TimeOffset = 0;
m_Selection = (SetTimeSelection)0; m_Selection = (SetTimeSelection)0;
ChangeSelection( 0 ); ChangeSelection( 0 );
@@ -89,7 +90,12 @@ void ScreenSetTime::Update( float fDelta )
{ {
Screen::Update( fDelta ); Screen::Update( fDelta );
tm now = GetLocalTime(); time_t iNow = time(NULL);
iNow += m_TimeOffset;
tm now;
localtime_r( &iNow, &now );
m_textValue[hour].SetText( ssprintf("%02d",now.tm_hour) ); m_textValue[hour].SetText( ssprintf("%02d",now.tm_hour) );
m_textValue[minute].SetText( ssprintf("%02d",now.tm_min) ); m_textValue[minute].SetText( ssprintf("%02d",now.tm_min) );
m_textValue[second].SetText( ssprintf("%02d",now.tm_sec) ); m_textValue[second].SetText( ssprintf("%02d",now.tm_sec) );
@@ -127,19 +133,28 @@ void ScreenSetTime::HandleScreenMessage( const ScreenMessage SM )
void ScreenSetTime::ChangeValue( int iDirection ) void ScreenSetTime::ChangeValue( int iDirection )
{ {
tm now = GetLocalTime(); time_t iNow = time(NULL);
time_t iAdjusted = iNow + m_TimeOffset;
tm adjusted;
localtime_r( &iAdjusted, &adjusted );
//tm now = GetLocalTime();
switch( m_Selection ) switch( m_Selection )
{ {
case hour: now.tm_hour += iDirection; break; case hour: adjusted.tm_hour += iDirection; break;
case minute: now.tm_min += iDirection; break; case minute: adjusted.tm_min += iDirection; break;
case second: now.tm_sec += iDirection; break; case second: adjusted.tm_sec += iDirection; break;
case year: now.tm_year += iDirection; break; case year: adjusted.tm_year += iDirection; break;
case month: now.tm_mon += iDirection; break; case month: adjusted.tm_mon += iDirection; break;
case day: now.tm_mday += iDirection; break; case day: adjusted.tm_mday += iDirection; break;
default: ASSERT(0); default: ASSERT(0);
} }
HOOKS->SetTime( now ); /* Normalize: */
iAdjusted = mktime( &adjusted );
m_TimeOffset = iAdjusted - iNow;
SOUND->PlayOnce( THEME->GetPathS("ScreenSetTime","ChangeValue") ); SOUND->PlayOnce( THEME->GetPathS("ScreenSetTime","ChangeValue") );
} }
@@ -190,6 +205,19 @@ void ScreenSetTime::MenuStart( PlayerNumber pn )
ChangeSelection( -1 ); ChangeSelection( -1 );
else if( m_Selection == NUM_SET_TIME_SELECTIONS -1 ) // last row else if( m_Selection == NUM_SET_TIME_SELECTIONS -1 ) // last row
{ {
/* Save the new time. */
time_t iNow = time(NULL);
time_t iAdjusted = iNow + m_TimeOffset;
tm adjusted;
localtime_r( &iAdjusted, &adjusted );
HOOKS->SetTime( adjusted );
/* We're going to draw a little more while we transition out. We've already
* set the new time; don't over-adjust visually. */
m_TimeOffset = 0;
SOUND->PlayOnce( THEME->GetPathS("Common","start") ); SOUND->PlayOnce( THEME->GetPathS("Common","start") );
StartTransitioning( SM_GoToNextScreen ); StartTransitioning( SM_GoToNextScreen );
} }
stepmania/src/ScreenSetTime.h
+1
View File
@@ -46,6 +46,7 @@ public:
private: private:
SetTimeSelection m_Selection; SetTimeSelection m_Selection;
time_t m_TimeOffset;
void ChangeSelection( int iDirection ); void ChangeSelection( int iDirection );
void ChangeValue( int iDirection ); void ChangeValue( int iDirection );