From c2c796d90c228e436f640c6326da12be25ff893e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 26 Feb 2004 03:18:51 +0000 Subject: [PATCH] fix warning --- stepmania/src/LuaHelpers.cpp | 5 ++++- stepmania/src/Player.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stepmania/src/LuaHelpers.cpp b/stepmania/src/LuaHelpers.cpp index 4cfaf6a915..eca38f1ffb 100644 --- a/stepmania/src/LuaHelpers.cpp +++ b/stepmania/src/LuaHelpers.cpp @@ -118,7 +118,10 @@ static int LuaPanic( lua_State *L ) * an exception from there. */ jbuf_error = err; longjmp( jbuf, 1 ); - return 0; // control never reaches here but quiets warning + /* This causes an "unreachable code" warning in VC. If you're getting a "control reaches + * end of function" warning, then your headers aren't correctly marking longjmp as NORETURN. + * My headers (glibc 2.3.2) do. -glenn */ +// return 0; // control never reaches here but quiets warning } bool Lua::RunExpression( const CString &str ) diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 71e92df035..b09b96744b 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -252,7 +252,7 @@ void PlayerMinus::Update( float fDeltaTime ) { float fPercentReverse = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].GetReversePercentForColumn(c); float fHoldJudgeYPos = SCALE( fPercentReverse, 0.f, 1.f, HOLD_JUDGMENT_Y_STANDARD, HOLD_JUDGMENT_Y_REVERSE ); - float fGrayYPos = SCALE( fPercentReverse, 0.f, 1.f, GRAY_ARROWS_Y_STANDARD, GRAY_ARROWS_Y_REVERSE ); +// float fGrayYPos = SCALE( fPercentReverse, 0.f, 1.f, GRAY_ARROWS_Y_STANDARD, GRAY_ARROWS_Y_REVERSE ); const float fX = ArrowGetXPos( m_PlayerNumber, c, 0 ); const float fZ = ArrowGetZPos( m_PlayerNumber, c, 0 );