Replace SAFE_DELETE / SAFE_DELETE_ARRAY macros

SAFE_DELETE -> RageUtil::SafeDelete
SAFE_DELETE_ARRAY -> RageUtil::SafeDeleteArray

Update JsonUtil.h to include RageUtil.h - MSVC doesn't need it included for some reason, but GCC and XCode does.
This commit is contained in:
sukibaby
2024-09-30 15:13:32 -07:00
committed by teejusb
parent cff063cd21
commit abf89ec2b1
62 changed files with 193 additions and 178 deletions
+14 -14
View File
@@ -299,16 +299,16 @@ Player::Player( NoteData &nd, bool bVisibleParts ) : m_NoteData(nd)
Player::~Player()
{
SAFE_DELETE( m_pAttackDisplay );
SAFE_DELETE( m_pNoteField );
RageUtil::SafeDelete( m_pAttackDisplay );
RageUtil::SafeDelete( m_pNoteField );
for( unsigned i = 0; i < m_vpHoldJudgment.size(); ++i )
SAFE_DELETE( m_vpHoldJudgment[i] );
SAFE_DELETE( m_pJudgedRows );
SAFE_DELETE( m_pIterNeedsTapJudging );
SAFE_DELETE( m_pIterNeedsHoldJudging );
SAFE_DELETE( m_pIterUncrossedRows );
SAFE_DELETE( m_pIterUnjudgedRows );
SAFE_DELETE( m_pIterUnjudgedMineRows );
RageUtil::SafeDelete( m_vpHoldJudgment[i] );
RageUtil::SafeDelete( m_pJudgedRows );
RageUtil::SafeDelete( m_pIterNeedsTapJudging );
RageUtil::SafeDelete( m_pIterNeedsHoldJudging );
RageUtil::SafeDelete( m_pIterUncrossedRows );
RageUtil::SafeDelete( m_pIterUnjudgedRows );
RageUtil::SafeDelete( m_pIterUnjudgedMineRows );
}
@@ -788,19 +788,19 @@ void Player::Load()
if( m_pPlayerStageStats )
SendComboMessages( m_pPlayerStageStats->m_iCurCombo, m_pPlayerStageStats->m_iCurMissCombo );
SAFE_DELETE( m_pIterNeedsTapJudging );
RageUtil::SafeDelete( m_pIterNeedsTapJudging );
m_pIterNeedsTapJudging = new NoteData::all_tracks_iterator( m_NoteData.GetTapNoteRangeAllTracks(iNoteRow, MAX_NOTE_ROW) );
SAFE_DELETE( m_pIterNeedsHoldJudging );
RageUtil::SafeDelete( m_pIterNeedsHoldJudging );
m_pIterNeedsHoldJudging = new NoteData::all_tracks_iterator( m_NoteData.GetTapNoteRangeAllTracks(iNoteRow, MAX_NOTE_ROW ) );
SAFE_DELETE( m_pIterUncrossedRows );
RageUtil::SafeDelete( m_pIterUncrossedRows );
m_pIterUncrossedRows = new NoteData::all_tracks_iterator( m_NoteData.GetTapNoteRangeAllTracks(iNoteRow, MAX_NOTE_ROW ) );
SAFE_DELETE( m_pIterUnjudgedRows );
RageUtil::SafeDelete( m_pIterUnjudgedRows );
m_pIterUnjudgedRows = new NoteData::all_tracks_iterator( m_NoteData.GetTapNoteRangeAllTracks(iNoteRow, MAX_NOTE_ROW ) );
SAFE_DELETE( m_pIterUnjudgedMineRows );
RageUtil::SafeDelete( m_pIterUnjudgedMineRows );
m_pIterUnjudgedMineRows = new NoteData::all_tracks_iterator( m_NoteData.GetTapNoteRangeAllTracks(iNoteRow, MAX_NOTE_ROW ) );
}