actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 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/ScreenHowToPlay.cpp
+6 -6
View File
@@ -69,9 +69,9 @@ ScreenHowToPlay::ScreenHowToPlay()
m_iNumW2s = NUM_W2S;
// initialize these because they might not be used.
m_pLifeMeterBar = NULL;
m_pmCharacter = NULL;
m_pmDancePad = NULL;
m_pLifeMeterBar = nullptr;
m_pmCharacter = nullptr;
m_pmDancePad = nullptr;
}
void ScreenHowToPlay::Init()
@@ -149,7 +149,7 @@ void ScreenHowToPlay::Init()
const Style* pStyle = GAMESTATE->GetCurrentStyle(PLAYER_INVALID);
Steps *pSteps = SongUtil::GetClosestNotes( &m_Song, pStyle->m_StepsType, Difficulty_Beginner );
if(pSteps == NULL)
if(pSteps == nullptr)
{
LuaHelpers::ReportScriptErrorFmt("No playable steps of StepsType '%s' for ScreenHowToPlay in file %s", StringConversion::ToString(pStyle->m_StepsType).c_str(), sStepsPath.c_str());
}
@@ -167,7 +167,7 @@ void ScreenHowToPlay::Init()
GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerController = PC_AUTOPLAY;
m_Player->Init("Player", GAMESTATE->m_pPlayerState[PLAYER_1],
NULL, m_pLifeMeterBar, NULL, NULL, NULL, NULL, NULL, NULL);
nullptr, m_pLifeMeterBar, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
m_Player.Load( m_NoteData );
m_Player->SetName( "Player" );
this->AddChild( m_Player );
@@ -244,7 +244,7 @@ void ScreenHowToPlay::Step()
void ScreenHowToPlay::Update( float fDelta )
{
if( GAMESTATE->m_pCurSong != NULL )
if( GAMESTATE->m_pCurSong != nullptr )
{
RageTimer tm;
GAMESTATE->UpdateSongPosition( m_fFakeSecondsIntoSong, GAMESTATE->m_pCurSong->m_SongTiming, tm );