From 861d515d82303bdeb8c9190ec63662c7ef511fd4 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 25 Jun 2006 21:40:42 +0000 Subject: [PATCH] NoteField.cpp:153: warning: converting to non-pointer type `int' from NULL --- stepmania/src/NoteField.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index 022fcc331e..a45ccd7b29 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -52,7 +52,7 @@ void NoteField::Unload() delete it->second; m_NoteDisplays.clear(); m_pCurDisplay = NULL; - memset( m_pDisplays, NULL, sizeof(m_pDisplays) ); + memset( m_pDisplays, 0, sizeof(m_pDisplays) ); } void NoteField::CacheNoteSkin( const RString &sNoteSkin_ ) @@ -111,7 +111,7 @@ void NoteField::CacheAllUsedNoteSkins() map::iterator it = m_NoteDisplays.find( m_pPlayerState->m_PlayerOptions.m_sNoteSkin ); ASSERT_M( it != m_NoteDisplays.end(), m_pPlayerState->m_PlayerOptions.m_sNoteSkin ); m_pCurDisplay = it->second; - memset( m_pDisplays, NULL, sizeof(m_pDisplays) ); + memset( m_pDisplays, 0, sizeof(m_pDisplays) ); FOREACH_EnabledPlayer( pn ) { const RString& sNoteSkin = GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions.m_sNoteSkin; @@ -150,7 +150,7 @@ void NoteField::Load( map::iterator it = m_NoteDisplays.find( m_pPlayerState->m_PlayerOptions.m_sNoteSkin ); ASSERT_M( it != m_NoteDisplays.end(), m_pPlayerState->m_PlayerOptions.m_sNoteSkin ); m_pCurDisplay = it->second; - memset( m_pDisplays, NULL, sizeof(m_pDisplays) ); + memset( m_pDisplays, 0, sizeof(m_pDisplays) ); FOREACH_EnabledPlayer( pn ) { const RString& sNoteSkin = GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions.m_sNoteSkin;