From a613d4d9faf6b24b1d5ad8b1e67b3ef9a8324643 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Wed, 16 Jun 2004 00:38:31 +0000 Subject: [PATCH] s/RAGE_ASSERT/ASSERT/ --- stepmania/src/ActorUtil.cpp | 6 +++--- stepmania/src/Attack.cpp | 2 +- stepmania/src/BGAnimation.cpp | 4 ++-- stepmania/src/GameState.cpp | 10 +++++----- stepmania/src/LuaHelpers.cpp | 4 ++-- stepmania/src/NoteData.cpp | 2 +- stepmania/src/NoteField.cpp | 10 +++++----- stepmania/src/NotesWriterDWI.cpp | 2 +- stepmania/src/RageFileManager.cpp | 8 ++++---- stepmania/src/RageSound.cpp | 2 +- stepmania/src/RageUtil.cpp | 2 +- stepmania/src/RageUtil_FileDB.cpp | 4 ++-- stepmania/src/ScreenMiniMenu.cpp | 2 +- stepmania/src/ScreenOptions.cpp | 8 ++++---- stepmania/src/SongManager.cpp | 4 ++-- stepmania/src/StageStats.cpp | 2 +- .../src/arch/MovieTexture/MovieTexture_FFMpeg.cpp | 8 ++++---- stepmania/src/arch/Sound/ALSA9Helpers.cpp | 2 +- stepmania/src/arch/Sound/DSoundHelpers.cpp | 2 +- .../arch/Sound/RageSoundDriver_Generic_Software.cpp | 4 ++-- 20 files changed, 44 insertions(+), 44 deletions(-) diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp index 9a583d87e6..67cbb439de 100644 --- a/stepmania/src/ActorUtil.cpp +++ b/stepmania/src/ActorUtil.cpp @@ -237,9 +237,9 @@ void UtilCommand( Actor& actor, CString sClassName, CString sCommandName ) { if( actor.GetID().empty() ) return; - } else { - RAGE_ASSERT_M( !actor.GetID().empty(), ssprintf("!actor.GetID().empty() ('%s', '%s')", sClassName.c_str(), sCommandName.c_str()) ); - } + } else + ASSERT_M( !actor.GetID().empty(), ssprintf("!actor.GetID().empty() ('%s', '%s')", + sClassName.c_str(), sCommandName.c_str()) ); actor.Command( THEME->GetMetric(sClassName,actor.GetID()+sCommandName+"Command") ); } diff --git a/stepmania/src/Attack.cpp b/stepmania/src/Attack.cpp index 8a94fc381e..d35cdea0dc 100644 --- a/stepmania/src/Attack.cpp +++ b/stepmania/src/Attack.cpp @@ -24,7 +24,7 @@ void Attack::GetAttackBeats( const Song *song, PlayerNumber pn, float &fStartBea GAMESTATE->GetUndisplayedBeats( pn, fSecsRemaining, fStartBeat, fEndBeat ); } - RAGE_ASSERT_M( fEndBeat >= fStartBeat, ssprintf("%f >= %f", fEndBeat, fStartBeat) ); + ASSERT_M( fEndBeat >= fStartBeat, ssprintf("%f >= %f", fEndBeat, fStartBeat) ); } bool Attack::operator== ( const Attack &rhs ) const diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp index 9f3eb596f7..1bdb053f65 100644 --- a/stepmania/src/BGAnimation.cpp +++ b/stepmania/src/BGAnimation.cpp @@ -48,7 +48,7 @@ void AddLayersFromAniDir( CString sAniDir, vector &layersAddTo, bool Gen if( sAniDir.Right(1) != "/" ) sAniDir += "/"; - RAGE_ASSERT_M( IsADirectory(sAniDir), sAniDir + " isn't a directory" ); + ASSERT_M( IsADirectory(sAniDir), sAniDir + " isn't a directory" ); CString sPathToIni = sAniDir + "BGAnimation.ini"; @@ -108,7 +108,7 @@ void BGAnimation::LoadFromAniDir( CString sAniDir ) if( sAniDir.Right(1) != "/" ) sAniDir += "/"; - RAGE_ASSERT_M( IsADirectory(sAniDir), sAniDir + " isn't a directory" ); + ASSERT_M( IsADirectory(sAniDir), sAniDir + " isn't a directory" ); CString sPathToIni = sAniDir + "BGAnimation.ini"; diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 9b00667924..1d289317e3 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -227,12 +227,12 @@ void CheckStageStats( const StageStats &ss, int p ) if( ss.pSong ) CHECKPOINT_M( ss.pSong->GetFullTranslitTitle() ); ASSERT( ss.pSteps[p] ); - RAGE_ASSERT_M( ss.playMode < NUM_PLAY_MODES, ssprintf("playmode %i", ss.playMode) ); - RAGE_ASSERT_M( ss.style < NUM_STYLES, ssprintf("style %i", ss.style) ); - RAGE_ASSERT_M( ss.pSteps[p]->GetDifficulty() < NUM_DIFFICULTIES, ssprintf("difficulty %i", ss.pSteps[p]->GetDifficulty()) ); + ASSERT_M( ss.playMode < NUM_PLAY_MODES, ssprintf("playmode %i", ss.playMode) ); + ASSERT_M( ss.style < NUM_STYLES, ssprintf("style %i", ss.style) ); + ASSERT_M( ss.pSteps[p]->GetDifficulty() < NUM_DIFFICULTIES, ssprintf("difficulty %i", ss.pSteps[p]->GetDifficulty()) ); /* Meter values can exceed MAX_METER; MAX_METER is just the highest meter value we * display/track. */ -// RAGE_ASSERT_M( ss.iMeter[p] < MAX_METER+1, ssprintf("%i", ss.iMeter[p]) ); +// ASSERT_M( ss.iMeter[p] < MAX_METER+1, ssprintf("%i", ss.iMeter[p]) ); } void GameState::PlayersFinalized() @@ -552,7 +552,7 @@ void GameState::UpdateSongPosition( float fPositionSeconds, const TimingData &ti else m_LastBeatUpdate.Touch(); timing.GetBeatAndBPSFromElapsedTime( fPositionSeconds, m_fSongBeat, m_fCurBPS, m_bFreeze ); - RAGE_ASSERT_M( m_fSongBeat > -2000, ssprintf("%f %f", m_fSongBeat, fPositionSeconds) ); + ASSERT_M( m_fSongBeat > -2000, ssprintf("%f %f", m_fSongBeat, fPositionSeconds) ); m_fMusicSeconds = fPositionSeconds; // LOG->Trace( "m_fMusicSeconds = %f, m_fSongBeat = %f, m_fCurBPS = %f, m_bFreeze = %f", m_fMusicSeconds, m_fSongBeat, m_fCurBPS, m_bFreeze ); diff --git a/stepmania/src/LuaHelpers.cpp b/stepmania/src/LuaHelpers.cpp index 2e9d8100df..1119dd37f0 100644 --- a/stepmania/src/LuaHelpers.cpp +++ b/stepmania/src/LuaHelpers.cpp @@ -141,7 +141,7 @@ try { Lua::RegisterFunctions( L ); LoadFromString( L, "return " + str ); - RAGE_ASSERT_M( lua_gettop(L) == 1, ssprintf("%i", lua_gettop(L)) ); + ASSERT_M( lua_gettop(L) == 1, ssprintf("%i", lua_gettop(L)) ); int ret = lua_pcall(L, 0, 1, 0); if( ret ) @@ -151,7 +151,7 @@ try { RageException::Throw( "Runtime error running \"%s\": %s", str.c_str(), err.c_str() ); } - RAGE_ASSERT_M( lua_gettop(L) == 1, ssprintf("%i", lua_gettop(L)) ); + ASSERT_M( lua_gettop(L) == 1, ssprintf("%i", lua_gettop(L)) ); /* Don't accept a function as a return value; if you really want to use a function * as a boolean, convert it before returning. */ diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp index 1e2b4e6ce3..15a0018302 100644 --- a/stepmania/src/NoteData.cpp +++ b/stepmania/src/NoteData.cpp @@ -745,7 +745,7 @@ void NoteData::LoadTransformed( const NoteData* pOriginal, int iNewNumTracks, co for( int t=0; t= %i (to %i)", + ASSERT_M( iOriginalTrack < Original.m_iNumTracks, ssprintf("from %i >= %i (to %i)", iOriginalTrack, Original.m_iNumTracks, iOriginalTrackToTakeFrom[t])); if( iOriginalTrack == -1 ) diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index bf0545f6df..80a7256074 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -123,7 +123,7 @@ void NoteField::RefreshBeatToNoteSkin() display = m_NoteDisplays.find( Skin ); } - RAGE_ASSERT_M( display != m_NoteDisplays.end(), ssprintf("Couldn't find %s", Skin.c_str()) ); + ASSERT_M( display != m_NoteDisplays.end(), ssprintf("Couldn't find %s", Skin.c_str()) ); NoteDisplayCols *cols = display->second; m_BeatToNoteDisplays[Beat] = cols; @@ -343,9 +343,9 @@ NoteField::NoteDisplayCols *NoteField::SearchForBeat( float Beat ) // Again with Beat = -9806 and GAMESTATE->m_fMusicSeconds = -3017.22 // Again in the middle of Remember December in Hardcore Galore: // Beat = -9373.56 and GAMESTATE->m_fMusicSeconds = -2923.48 - RAGE_ASSERT_M( it != m_BeatToNoteDisplays.begin(), ssprintf("%f",Beat) ); + ASSERT_M( it != m_BeatToNoteDisplays.begin(), ssprintf("%f",Beat) ); --it; - RAGE_ASSERT_M( it != m_BeatToNoteDisplays.end(), ssprintf("%f",Beat) ); + ASSERT_M( it != m_BeatToNoteDisplays.end(), ssprintf("%f",Beat) ); return it->second; } @@ -557,7 +557,7 @@ void NoteField::DrawPrimitives() if( bIsActive ) SearchForSongBeat()->m_GhostArrowRow.SetHoldIsActive( hn.iTrack ); - RAGE_ASSERT_M( NoteRowToBeat(hn.iStartRow) > -2000, ssprintf("%i %i %i", hn.iStartRow, hn.iEndRow, hn.iTrack) ); + ASSERT_M( NoteRowToBeat(hn.iStartRow) > -2000, ssprintf("%i %i %i", hn.iStartRow, hn.iEndRow, hn.iTrack) ); SearchForBeat( CurDisplay, NextDisplay, NoteRowToBeat(hn.iStartRow) ); bool bIsInSelectionRange = false; @@ -616,7 +616,7 @@ void NoteField::DrawPrimitives() bool bIsMine = (tn == TAP_MINE); bool bIsAttack = IsTapAttack(tn); - RAGE_ASSERT_M( NoteRowToBeat(i) > -2000, ssprintf("%i %i %i, %f %f", i, iLastIndexToDraw, iFirstIndexToDraw, GAMESTATE->m_fSongBeat, GAMESTATE->m_fMusicSeconds) ); + ASSERT_M( NoteRowToBeat(i) > -2000, ssprintf("%i %i %i, %f %f", i, iLastIndexToDraw, iFirstIndexToDraw, GAMESTATE->m_fSongBeat, GAMESTATE->m_fMusicSeconds) ); SearchForBeat( CurDisplay, NextDisplay, NoteRowToBeat(i) ); NoteDisplayCols *nd = CurDisplay->second; if( bIsAttack ) diff --git a/stepmania/src/NotesWriterDWI.cpp b/stepmania/src/NotesWriterDWI.cpp index 8b17668241..53c1df023b 100644 --- a/stepmania/src/NotesWriterDWI.cpp +++ b/stepmania/src/NotesWriterDWI.cpp @@ -224,7 +224,7 @@ void NotesWriterDWI::WriteDWINotesField( RageFile &f, const Steps &out, int star fCurrentIncrementer = 1.0/192 * BEATS_PER_MEASURE; break; default: - RAGE_ASSERT_M(0, ssprintf("nt = %d",nt) ); + ASSERT_M(0, ssprintf("nt = %d",nt) ); break; } diff --git a/stepmania/src/RageFileManager.cpp b/stepmania/src/RageFileManager.cpp index 2a7a7ddd5c..397fa2dbcb 100644 --- a/stepmania/src/RageFileManager.cpp +++ b/stepmania/src/RageFileManager.cpp @@ -185,7 +185,7 @@ void RageFileManager::MountInitialFilesystems() CStringArray parts; split( DirOfExecutable, "/", parts ); CHECKPOINT_M( ssprintf( "... %i parts", parts.size()) ); - RAGE_ASSERT_M( parts.size() > 1, ssprintf("Strange DirOfExecutable: %s", DirOfExecutable.c_str()) ); + ASSERT_M( parts.size() > 1, ssprintf("Strange DirOfExecutable: %s", DirOfExecutable.c_str()) ); CString Dir = join( "/", parts.begin(), parts.end()-1 ); RageFileManager::Mount( "dir", Dir, "" ); #else @@ -495,7 +495,7 @@ void AddReference( const RageFileObj *obj, RageFileDriver *driver ) /* map::insert returns an iterator (which we discard) and a bool, indicating whether * this is a new entry. This should always be new. */ const pair< FileReferences::iterator, bool > ret = g_Refs.insert( ref ); - RAGE_ASSERT_M( ret.second, ssprintf( "RemoveReference: Duplicate reference (%s)", obj->GetDisplayPath().c_str() ) ); + ASSERT_M( ret.second, ssprintf( "RemoveReference: Duplicate reference (%s)", obj->GetDisplayPath().c_str() ) ); } void RemoveReference( const RageFileObj *obj ) @@ -503,7 +503,7 @@ void RemoveReference( const RageFileObj *obj ) LockMut( *g_Mutex ); FileReferences::iterator it = g_Refs.find( obj ); - RAGE_ASSERT_M( it != g_Refs.end(), ssprintf( "RemoveReference: Missing reference (%s)", obj->GetDisplayPath().c_str() ) ); + ASSERT_M( it != g_Refs.end(), ssprintf( "RemoveReference: Missing reference (%s)", obj->GetDisplayPath().c_str() ) ); g_Refs.erase( it ); } @@ -574,7 +574,7 @@ RageFileObj *RageFileManager::CopyFileObj( const RageFileObj *cpy, RageFile &p ) LockMut( *g_Mutex ); FileReferences::const_iterator it = g_Refs.find( cpy ); - RAGE_ASSERT_M( it != g_Refs.end(), ssprintf( "RemoveReference: Missing reference (%s)", cpy->GetDisplayPath().c_str() ) ); + ASSERT_M( it != g_Refs.end(), ssprintf( "RemoveReference: Missing reference (%s)", cpy->GetDisplayPath().c_str() ) ); RageFileObj *ret = cpy->Copy( p ); diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index 7f8d67897c..cf6662c403 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -376,7 +376,7 @@ void AdjustBalance( int16_t *buffer, int frames, float fBalance ) swap( fLeftFactors[1], fRightFactors[1] ); } - RAGE_ASSERT_M( channels == 2, ssprintf("%i", channels) ); + ASSERT_M( channels == 2, ssprintf("%i", channels) ); for( int samp = 0; samp < frames; ++samp ) { int16_t l = int16_t(buffer[0]*fLeftFactors[0] + buffer[1]*fLeftFactors[1]); diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index 83f60c1fc4..48f114249a 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -29,7 +29,7 @@ int RandomGen::operator() ( int maximum ) void fapproach( float& val, float other_val, float to_move ) { - RAGE_ASSERT_M( to_move >= 0, ssprintf("to_move: %f", to_move) ); + ASSERT_M( to_move >= 0, ssprintf("to_move: %f", to_move) ); if( val == other_val ) return; float fDelta = other_val - val; diff --git a/stepmania/src/RageUtil_FileDB.cpp b/stepmania/src/RageUtil_FileDB.cpp index 9b9ba33584..bd3abc1df4 100644 --- a/stepmania/src/RageUtil_FileDB.cpp +++ b/stepmania/src/RageUtil_FileDB.cpp @@ -154,8 +154,8 @@ bool FilenameDB::ResolvePath(CString &path) fs = GetFileSet( ret ); CString p = path.substr( begin, size ); - RAGE_ASSERT_M( p.size() != 1 || p[0] != '.', path ); // no . - RAGE_ASSERT_M( p.size() != 2 || p[0] != '.' || p[1] != '.', path ); // no .. + ASSERT_M( p.size() != 1 || p[0] != '.', path ); // no . + ASSERT_M( p.size() != 2 || p[0] != '.' || p[1] != '.', path ); // no .. set::iterator it = fs->files.find( File(p) ); /* If there were no matches, the path isn't found. */ diff --git a/stepmania/src/ScreenMiniMenu.cpp b/stepmania/src/ScreenMiniMenu.cpp index 14ad44f952..5cc547d2c6 100644 --- a/stepmania/src/ScreenMiniMenu.cpp +++ b/stepmania/src/ScreenMiniMenu.cpp @@ -88,7 +88,7 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes m_textAnswer[i].GetUnzoomedWidth() * ZOOM_SELECTED ); } - RAGE_ASSERT_M( line.choices.empty() || line.defaultChoice < (int) line.choices.size(), + ASSERT_M( line.choices.empty() || line.defaultChoice < (int) line.choices.size(), ssprintf("%i, %i", line.defaultChoice, (int) line.choices.size()) ); CString sText = line.choices.empty() ? "" : line.choices[line.defaultChoice]; m_textAnswer[i].SetText( sText ); diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index a3171ad6e3..005cd72392 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -552,7 +552,7 @@ CString ScreenOptions::GetExplanationTitle( int iRow ) const BitmapText &ScreenOptions::GetTextItemForRow( PlayerNumber pn, int iRow, int iChoiceOnRow ) { - RAGE_ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %i", iRow, (int)m_Rows.size() ) ); + ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %i", iRow, (int)m_Rows.size() ) ); Row &row = *m_Rows[iRow]; if( row.Type == Row::ROW_EXIT ) return *row.m_textItems[0]; @@ -569,7 +569,7 @@ BitmapText &ScreenOptions::GetTextItemForRow( PlayerNumber pn, int iRow, int iCh else index = iChoiceOnRow; - RAGE_ASSERT_M( index < (int)row.m_textItems.size(), ssprintf("%i < %i", index, (int)row.m_textItems.size() ) ); + ASSERT_M( index < (int)row.m_textItems.size(), ssprintf("%i < %i", index, (int)row.m_textItems.size() ) ); return *row.m_textItems[index]; } @@ -723,7 +723,7 @@ void ScreenOptions::PositionCursors() continue; const int iRow = m_iCurrentRow[pn]; - RAGE_ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %i", iRow, (int)m_Rows.size() ) ); + ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %i", iRow, (int)m_Rows.size() ) ); Row &Row = *m_Rows[iRow]; OptionsCursor &highlight = m_Highlight[pn]; @@ -741,7 +741,7 @@ void ScreenOptions::TweenCursor( PlayerNumber pn ) { // Set the position of the highlight showing the current option the user is changing. const int iRow = m_iCurrentRow[pn]; - RAGE_ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %i", iRow, (int)m_Rows.size() ) ); + ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %i", iRow, (int)m_Rows.size() ) ); const Row &Row = *m_Rows[iRow]; const int iChoiceWithFocus = Row.m_iChoiceWithFocus[pn]; diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 37524a5609..95cca2adf0 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -361,7 +361,7 @@ RageColor SongManager::GetGroupColor( const CString &sGroupName ) if( m_sGroupNames[i] == sGroupName ) break; } - RAGE_ASSERT_M( i != m_sGroupNames.size(), sGroupName ); // this is not a valid group + ASSERT_M( i != m_sGroupNames.size(), sGroupName ); // this is not a valid group return g_vGroupColors[i%g_vGroupColors.size()]; } @@ -778,7 +778,7 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd, sGroup = GAMESTATE->m_pCurSong->m_sGroupName; } - RAGE_ASSERT_M( sGroup != "", ssprintf("%p '%s' '%s'", + ASSERT_M( sGroup != "", ssprintf("%p '%s' '%s'", GAMESTATE->m_pCurSong, GAMESTATE->m_pCurSong? GAMESTATE->m_pCurSong->GetSongDir().c_str():"", GAMESTATE->m_pCurSong? GAMESTATE->m_pCurSong->m_sGroupName.c_str():"") ); diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp index c029a07306..4b7daad8b4 100644 --- a/stepmania/src/StageStats.cpp +++ b/stepmania/src/StageStats.cpp @@ -244,7 +244,7 @@ float StageStats::GetPercentDancePoints( PlayerNumber pn ) const return 1; // correct for rounding error /* This can happen in battle, with transform attacks. */ - //RAGE_ASSERT_M( iActualDancePoints[pn] <= iPossibleDancePoints[pn], ssprintf("%i/%i", iActualDancePoints[pn], iPossibleDancePoints[pn]) ); + //ASSERT_M( iActualDancePoints[pn] <= iPossibleDancePoints[pn], ssprintf("%i/%i", iActualDancePoints[pn], iPossibleDancePoints[pn]) ); float fPercentDancePoints = iActualDancePoints[pn] / (float)iPossibleDancePoints[pn]; diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp index 3b00166e36..807641cbf0 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp @@ -387,7 +387,7 @@ int FFMpeg_Helper::DecodePacket() void MovieTexture_FFMpeg::ConvertFrame() { - RAGE_ASSERT_M( m_ImageWaiting == FRAME_DECODED, ssprintf("%i", m_ImageWaiting ) ); + ASSERT_M( m_ImageWaiting == FRAME_DECODED, ssprintf("%i", m_ImageWaiting ) ); avcodec::AVPicture pict; pict.data[0] = (unsigned char *)m_img->pixels; @@ -733,7 +733,7 @@ void MovieTexture_FFMpeg::UpdateTimer() * (due to pause, EOF, etc). If true is returned, we'll be in FRAME_DECODED. */ bool MovieTexture_FFMpeg::DecodeFrame() { - RAGE_ASSERT_M( m_ImageWaiting == FRAME_NONE, ssprintf("%i", m_ImageWaiting) ); + ASSERT_M( m_ImageWaiting == FRAME_NONE, ssprintf("%i", m_ImageWaiting) ); if( m_State != PLAYING ) return false; @@ -785,7 +785,7 @@ bool MovieTexture_FFMpeg::DecodeFrame() */ float MovieTexture_FFMpeg::CheckFrameTime() { - RAGE_ASSERT_M( m_ImageWaiting == FRAME_DECODED, ssprintf("%i", m_ImageWaiting) ); + ASSERT_M( m_ImageWaiting == FRAME_DECODED, ssprintf("%i", m_ImageWaiting) ); const float Offset = decoder->GetTimestamp() - m_Clock; @@ -835,7 +835,7 @@ float MovieTexture_FFMpeg::CheckFrameTime() void MovieTexture_FFMpeg::DiscardFrame() { - RAGE_ASSERT_M( m_ImageWaiting == FRAME_DECODED, ssprintf("%i", m_ImageWaiting) ); + ASSERT_M( m_ImageWaiting == FRAME_DECODED, ssprintf("%i", m_ImageWaiting) ); m_ImageWaiting = FRAME_NONE; } diff --git a/stepmania/src/arch/Sound/ALSA9Helpers.cpp b/stepmania/src/arch/Sound/ALSA9Helpers.cpp index b72c2222bb..8a77d03f7a 100644 --- a/stepmania/src/arch/Sound/ALSA9Helpers.cpp +++ b/stepmania/src/arch/Sound/ALSA9Helpers.cpp @@ -39,7 +39,7 @@ bool Alsa9Buf::SetHWParams() err = dsnd_pcm_hw_free( pcm ); ALSA_ASSERT("dsnd_pcm_hw_free"); } -// RAGE_ASSERT_M( dsnd_pcm_state(pcm) == SND_PCM_STATE_OPEN, ssprintf("(%s)", dsnd_pcm_state_name(dsnd_pcm_state(pcm))) ); +// ASSERT_M( dsnd_pcm_state(pcm) == SND_PCM_STATE_OPEN, ssprintf("(%s)", dsnd_pcm_state_name(dsnd_pcm_state(pcm))) ); /* allocate the hardware parameters structure */ snd_pcm_hw_params_t *hwparams; diff --git a/stepmania/src/arch/Sound/DSoundHelpers.cpp b/stepmania/src/arch/Sound/DSoundHelpers.cpp index 4548a1c88b..c258b09b61 100644 --- a/stepmania/src/arch/Sound/DSoundHelpers.cpp +++ b/stepmania/src/arch/Sound/DSoundHelpers.cpp @@ -509,7 +509,7 @@ void DSoundBuf::Stop() /* This isn't true on some broken cards. */ // DWORD play, write; // buf->GetCurrentPosition( &play, &write ); -// RAGE_ASSERT_M( play == 0 && write == 0, ssprintf("%i, %i", play, write) ); +// ASSERT_M( play == 0 && write == 0, ssprintf("%i, %i", play, write) ); playing = false; } diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp index bb6d0f9655..8fd95f6f49 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp @@ -43,7 +43,7 @@ static int g_TotalAheadCount = 0; void RageSound_Generic_Software::Mix( int16_t *buf, int frames, int64_t frameno, int64_t current_frameno ) { - RAGE_ASSERT_M( m_DecodeThread.IsCreated(), "RageSound_Generic_Software::StartDecodeThread() was never called" ); + ASSERT_M( m_DecodeThread.IsCreated(), "RageSound_Generic_Software::StartDecodeThread() was never called" ); if( frameno - current_frameno + frames > 0 ) { @@ -214,7 +214,7 @@ bool RageSound_Generic_Software::GetDataForSound( sound &s ) s.buffer.get_write_pointers( p, psize ); /* If we have no open buffer slot, we have a buffer overflow. */ - RAGE_ASSERT_M( psize[0] > 0, ssprintf("%i", (int)s.frames_buffered()) ); + ASSERT_M( psize[0] > 0, ssprintf("%i", (int)s.frames_buffered()) ); sound_block *b = p[0]; bool eof = !s.snd->GetDataToPlay( b->buf, ARRAYSIZE(b->buf)/channels, b->position, b->frames_in_buffer );