diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index a1786c04b8..c2684110f8 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -247,7 +247,7 @@ void BitmapText::DrawPrimitives() const char c = szLine[j]; const int iFrameNo = m_pFont->m_iCharToFrameNo[ (unsigned char)c ]; if( iFrameNo == -1 ) // this font doesn't impelemnt this character - throw RageException( "The font '%s' does not implement the character '%c'", m_sFontFilePath.GetString(), c ); + RageException::Throw( "The font '%s' does not implement the character '%c'", m_sFontFilePath.GetString(), c ); const int iCharWidth = m_pFont->m_iFrameNoToWidth[iFrameNo]; // The right side of any italic letter is being cropped. So, we're going to draw a little bit diff --git a/stepmania/src/DifficultyIcon.cpp b/stepmania/src/DifficultyIcon.cpp index 7f1300100a..42b6bd717e 100644 --- a/stepmania/src/DifficultyIcon.cpp +++ b/stepmania/src/DifficultyIcon.cpp @@ -23,7 +23,7 @@ bool DifficultyIcon::Load( CString sPath ) { Sprite::Load( sPath ); if( GetNumStates() != 6 && GetNumStates() != 12 ) - throw RageException( "The difficulty icon graphic '%s' must have 6 or 12 states.", sPath.GetString() ); + RageException::Throw( "The difficulty icon graphic '%s' must have 6 or 12 states.", sPath.GetString() ); StopAnimating(); return true; } diff --git a/stepmania/src/FontManager.cpp b/stepmania/src/FontManager.cpp index a9ea1e1397..4800dd0e5b 100644 --- a/stepmania/src/FontManager.cpp +++ b/stepmania/src/FontManager.cpp @@ -106,7 +106,7 @@ void FontManager::UnloadFont( CString sFontFilePath ) Font* pFont; std::map::iterator p = m_mapPathToFont.find(sFontFilePath); if(p == m_mapPathToFont.end()) - throw RageException( "Tried to Unload a font that wasn't loaded. '%s'", sFontFilePath.GetString() ); + RageException::Throw( "Tried to Unload a font that wasn't loaded. '%s'", sFontFilePath.GetString() ); pFont=p->second; pFont->m_iRefCount--; diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index ccc05eafdc..860d91b142 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -1246,7 +1246,7 @@ void GameManager::SwitchNoteSkin( CString sNewNoteSkin ) CString sPath = GetCurNoteSkinDir() + "metrics.ini"; m_pIniFile->SetPath(sPath); if( !m_pIniFile->ReadFile() ) - throw RageException( "Could not read NoteSkin metrics file '%s'", sPath.GetString() ); + RageException::Throw( "Could not read NoteSkin metrics file '%s'", sPath.GetString() ); } } @@ -1261,7 +1261,7 @@ CString GameManager::GetMetric( CString sClassName, CString sValue ) // looks in { CString sReturn; if( !m_pIniFile->GetValue( sClassName, sValue, sReturn ) ) - throw RageException( "Could not read metric '%s - %s' from '%smetrics.ini'", sClassName.GetString(), sValue.GetString(), GetCurNoteSkinDir().GetString() ); + RageException::Throw( "Could not read metric '%s - %s' from '%smetrics.ini'", sClassName.GetString(), sValue.GetString(), GetCurNoteSkinDir().GetString() ); return sReturn; } @@ -1296,6 +1296,10 @@ RageColor GameManager::GetMetricC( CString sClassName, CString sValueName ) return RageColor(r,g,b,a); } +__declspec(noreturn) void blah() +{ + +} CString GameManager::GetPathTo( const int col, CString sElementName ) // looks in GAMESTATE for the current Style { @@ -1320,7 +1324,7 @@ CString GameManager::GetPathTo( const int col, CString sElementName ) // looks i if( !arrayPossibleFileNames.empty() ) return arrayPossibleFileNames[0]; - throw RageException( "The NoteSkin element '%s %s' is missing from '%s'.", sButtonName.GetString(), sElementName.GetString(), sDir.GetString() ); + RageException::Throw( "The NoteSkin element '%s %s' is missing from '%s'.", sButtonName.GetString(), sElementName.GetString(), sDir.GetString() ); } void GameManager::GetEnabledGames( CArray& aGamesOut )