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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenSetTime.cpp
+3 -3
View File
@@ -81,7 +81,7 @@ void ScreenSetTime::Update( float fDelta )
{
Screen::Update( fDelta );
time_t iNow = time(NULL);
time_t iNow = time(nullptr);
iNow += m_TimeOffset;
tm now;
@@ -113,7 +113,7 @@ bool ScreenSetTime::Input( const InputEventPlus &input )
void ScreenSetTime::ChangeValue( int iDirection )
{
time_t iNow = time(NULL);
time_t iNow = time(nullptr);
time_t iAdjusted = iNow + m_TimeOffset;
tm adjusted;
@@ -194,7 +194,7 @@ bool ScreenSetTime::MenuStart( const InputEventPlus &input )
else if( m_Selection == NUM_SetTimeSelection -1 ) // last row
{
/* Save the new time. */
time_t iNow = time(NULL);
time_t iNow = time(nullptr);
time_t iAdjusted = iNow + m_TimeOffset;
tm adjusted;