From 03499669bddb3d0a7453842a463ed2755009faff Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Tue, 24 Feb 2004 08:00:04 +0000 Subject: [PATCH] fix warnings --- stepmania/src/ActorCommands.cpp | 2 +- stepmania/src/ConditionalBGA.cpp | 3 ++- stepmania/src/LuaHelpers.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ActorCommands.cpp b/stepmania/src/ActorCommands.cpp index 321c050231..f829f63dae 100644 --- a/stepmania/src/ActorCommands.cpp +++ b/stepmania/src/ActorCommands.cpp @@ -19,7 +19,7 @@ void IncorrectActorParametersWarning( const ParsedCommand &command, int iMaxIndexAccessed ) { const CString sError = ssprintf( "Actor::HandleCommand: Wrong number of parameters in command '%s'. Expected %d but there are %u.", - command.GetOriginalCommandString().c_str(), iMaxIndexAccessed+1, command.vTokens.size() ); + command.GetOriginalCommandString().c_str(), iMaxIndexAccessed+1, unsigned(command.vTokens.size()) ); LOG->Warn( sError ); HOOKS->MessageBoxOK( sError ); } diff --git a/stepmania/src/ConditionalBGA.cpp b/stepmania/src/ConditionalBGA.cpp index a74076d9f3..74abf6d99e 100644 --- a/stepmania/src/ConditionalBGA.cpp +++ b/stepmania/src/ConditionalBGA.cpp @@ -527,7 +527,8 @@ void ConditionalBGA::CheckBgaRequirements(BgaCondInfo info) else // we have to check the history of grades to ensure they met the spec asked { LOG->Info("Checking Grade History"); - LOG->Info("Stage Stats Size: %d NumConditionalGrades: %d",g_vPlayedStageStats.size(),info.grades.size()); + LOG->Info("Stage Stats Size: %u NumConditionalGrades: %u", + unsigned(g_vPlayedStageStats.size()), unsigned(info.grades.size())); bool foundavalidgradeforstage = false; for(unsigned d=info.grades.size()-1,g=g_vPlayedStageStats.size()-1;d>0;d--,g--) { diff --git a/stepmania/src/LuaHelpers.cpp b/stepmania/src/LuaHelpers.cpp index 6a4eb60b1c..5547f1efe6 100644 --- a/stepmania/src/LuaHelpers.cpp +++ b/stepmania/src/LuaHelpers.cpp @@ -97,7 +97,7 @@ void LoadFromString( lua_State *L, const CString &str ) static jmp_buf jbuf; static CString jbuf_error; -int LuaPanic( lua_State *L ) +static int LuaPanic( lua_State *L ) { CString err; Lua::PopStack( L, err ); @@ -107,6 +107,7 @@ int LuaPanic( lua_State *L ) * an exception from there. */ jbuf_error = err; longjmp( jbuf, 1 ); + return 0; // control never reaches here but quiets warning } bool Lua::RunExpression( const CString &str )