From 4977f29fe3818fb4d15b8b7c249afd50df3dcbca Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Thu, 28 Mar 2019 15:05:07 -0700 Subject: [PATCH] silence a bunch of msvc warnings --- src/Background.cpp | 2 +- src/Course.cpp | 2 +- src/CourseContentsList.cpp | 2 +- src/GameSoundManager.cpp | 2 +- src/GrooveRadar.cpp | 2 +- src/LifeMeterBattery.cpp | 2 +- src/OptionRowHandler.cpp | 6 +++--- src/RageDisplay.cpp | 2 +- src/ScreenEvaluation.cpp | 24 ++++++++++++------------ src/ScreenOptionsEditCourse.cpp | 2 +- src/StepMania.cpp | 4 ++-- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Background.cpp b/src/Background.cpp index 364ec9616b..7e996c5820 100644 --- a/src/Background.cpp +++ b/src/Background.cpp @@ -447,7 +447,7 @@ void BackgroundImpl::LoadFromRandom( float fFirstBeat, float fEndBeat, const Bac int time_signature_start= max(ts->GetRow(),iStartRow); for(int j= time_signature_start; jGetNoteRowsPerMeasure()) + j+= int(RAND_BG_CHANGE_MEASURES * ts->GetNoteRowsPerMeasure())) { // Don't fade. It causes frame rate dip, especially on slower machines. BackgroundDef bd = m_Layer[0].CreateRandomBGA(m_pSong, diff --git a/src/Course.cpp b/src/Course.cpp index f902717195..9a58f853bb 100644 --- a/src/Course.cpp +++ b/src/Course.cpp @@ -713,7 +713,7 @@ void Course::GetTrailUnsortedEndless( const vector &entries, Trail ASSERT( e->iChooseIndex >= 0 ); if( e->iChooseIndex < int( vSongAndSteps.size() ) ) { - if( songIndex >= vpSongs.size() ) { + if( songIndex >= int(vpSongs.size()) ) { songIndex = 0; } resolved.pSong = vpSongs[ songIndex ]; diff --git a/src/CourseContentsList.cpp b/src/CourseContentsList.cpp index b320f1f282..f5aa87fc3c 100644 --- a/src/CourseContentsList.cpp +++ b/src/CourseContentsList.cpp @@ -70,7 +70,7 @@ void CourseContentsList::SetFromGameState() if( bLoop ) { SetPauseCountdownSeconds( 1.5f ); - this->SetDestinationItem( m_vpDisplay.size()+1 ); // loop forever + this->SetDestinationItem( (float)m_vpDisplay.size()+1 ); // loop forever } } diff --git a/src/GameSoundManager.cpp b/src/GameSoundManager.cpp index 170b1f954c..0c9a9ef5ee 100644 --- a/src/GameSoundManager.cpp +++ b/src/GameSoundManager.cpp @@ -314,7 +314,7 @@ static void DoPlayOnceFromDir( RString sPath ) // If order is exhausted, repopulate and reshuffle if (order.size() == 0) { - for (int i = 0; i < arraySoundFiles.size(); ++i) + for (int i = 0; i < (int)arraySoundFiles.size(); ++i) { order.push_back(i); } diff --git a/src/GrooveRadar.cpp b/src/GrooveRadar.cpp index 93deafef8a..efada8c834 100644 --- a/src/GrooveRadar.cpp +++ b/src/GrooveRadar.cpp @@ -107,7 +107,7 @@ void GrooveRadar::GrooveRadarValueMap::SetFromSteps( const RadarValues &rv ) { const float fValueCurrent = m_fValuesOld[c] * (1-m_PercentTowardNew) + m_fValuesNew[c] * m_PercentTowardNew; m_fValuesOld[c] = fValueCurrent; - m_fValuesNew[c] = clamp(rv[c], 0.0, 1.0); + m_fValuesNew[c] = (int)clamp(rv[c], 0.0, 1.0); } if( !m_bValuesVisible ) // the values WERE invisible diff --git a/src/LifeMeterBattery.cpp b/src/LifeMeterBattery.cpp index f02216adff..85d044d2bd 100644 --- a/src/LifeMeterBattery.cpp +++ b/src/LifeMeterBattery.cpp @@ -100,7 +100,7 @@ void LifeMeterBattery::OnSongEnded() LuaHelpers::Push(L, pn); RString error= "Error running CourseSongRewardLives callback: "; LuaHelpers::RunScriptOnStack(L, error, 2, 1, true); - m_iLivesLeft += luaL_optnumber(L, -1, 0); + m_iLivesLeft += (int)luaL_optnumber(L, -1, 0); lua_settop(L, 0); LUA->Release(L); } diff --git a/src/OptionRowHandler.cpp b/src/OptionRowHandler.cpp index 1810e0d04d..0821f7057d 100644 --- a/src/OptionRowHandler.cpp +++ b/src/OptionRowHandler.cpp @@ -1063,15 +1063,15 @@ public: lua_pop( L, 1 ); lua_getfield(L, -1, "GoToFirstOnStart"); - m_GoToFirstOnStart= lua_toboolean(L, -1); + m_GoToFirstOnStart = lua_toboolean(L, -1) > 0; lua_pop(L, 1); lua_getfield(L, -1, "OneChoiceForAllPlayers"); - m_Def.m_bOneChoiceForAllPlayers = lua_toboolean( L, -1 ); + m_Def.m_bOneChoiceForAllPlayers = lua_toboolean( L, -1 ) > 0; lua_pop( L, 1 ); lua_getfield(L, -1, "ExportOnChange"); - m_Def.m_bExportOnChange = lua_toboolean( L, -1 ); + m_Def.m_bExportOnChange = lua_toboolean( L, -1 ) > 0; lua_pop( L, 1 ); // TODO: Change these to use the proper enum strings like everything diff --git a/src/RageDisplay.cpp b/src/RageDisplay.cpp index e9b3838592..c41ef56d16 100644 --- a/src/RageDisplay.cpp +++ b/src/RageDisplay.cpp @@ -1081,7 +1081,7 @@ public: ADD_METHOD( GetCumFPS ); ADD_METHOD( GetDisplaySpecs ); ADD_METHOD( SupportsRenderToTexture ); - ADD_METHOD( SupportsFullscreenBorderlessWindow); + ADD_METHOD( SupportsFullscreenBorderlessWindow ); } }; diff --git a/src/ScreenEvaluation.cpp b/src/ScreenEvaluation.cpp index 3df390e395..79ab877702 100644 --- a/src/ScreenEvaluation.cpp +++ b/src/ScreenEvaluation.cpp @@ -209,8 +209,8 @@ void ScreenEvaluation::Init() case RadarCategory_Rolls: case RadarCategory_Lifts: case RadarCategory_Fakes: - ss.m_player[p].m_radarPossible[rc] = 1 + (rand() % 200); - ss.m_player[p].m_radarActual[rc] = rand() % (int)(ss.m_player[p].m_radarPossible[rc]); + ss.m_player[p].m_radarPossible[rc] = float(1 + (rand() % 200)); + ss.m_player[p].m_radarActual[rc] = float(rand() % (int)(ss.m_player[p].m_radarPossible[rc])); break; default: break; } @@ -270,13 +270,13 @@ void ScreenEvaluation::Init() m_SmallBanner[i].LoadFromSong( pSong ); m_SmallBanner[i].ScaleToClipped( BANNER_WIDTH, BANNER_HEIGHT ); - m_SmallBanner[i].SetName( ssprintf("SmallBanner%zu",i+1) ); + m_SmallBanner[i].SetName( ssprintf("SmallBanner%u",(unsigned)i+1) ); ActorUtil::LoadAllCommands( m_SmallBanner[i], m_sName ); SET_XY( m_SmallBanner[i] ); this->AddChild( &m_SmallBanner[i] ); m_sprSmallBannerFrame[i].Load( THEME->GetPathG(m_sName,"BannerFrame") ); - m_sprSmallBannerFrame[i]->SetName( ssprintf("SmallBanner%zu",i+1) ); + m_sprSmallBannerFrame[i]->SetName( ssprintf("SmallBanner%u",(unsigned)i+1) ); ActorUtil::LoadAllCommands( *m_sprSmallBannerFrame[i], m_sName ); SET_XY( m_sprSmallBannerFrame[i] ); this->AddChild( m_sprSmallBannerFrame[i] ); @@ -548,7 +548,7 @@ void ScreenEvaluation::Init() DEFAULT_FAIL( l ); } - m_textJudgmentLineNumber[l][p].SetTargetNumber( iValue ); + m_textJudgmentLineNumber[l][p].SetTargetNumber( float(iValue) ); } } } @@ -577,7 +577,7 @@ void ScreenEvaluation::Init() static const int indices[NUM_DetailLine] = { - RadarCategory_TapsAndHolds, RadarCategory_Jumps, RadarCategory_Holds, RadarCategory_Mines, + RadarCategory_TapsAndHolds, RadarCategory_Jumps, RadarCategory_Holds, RadarCategory_Mines, RadarCategory_Hands, RadarCategory_Rolls, RadarCategory_Lifts, RadarCategory_Fakes }; const int ind = indices[l]; @@ -607,7 +607,7 @@ void ScreenEvaluation::Init() m_textScore[p].Load( "RollingNumbersEvaluation" ); ActorUtil::LoadAllCommands( m_textScore[p], m_sName ); SET_XY( m_textScore[p] ); - m_textScore[p].SetTargetNumber( m_pStageStats->m_player[p].m_iScore ); + m_textScore[p].SetTargetNumber( float(m_pStageStats->m_player[p].m_iScore) ); this->AddChild( &m_textScore[p] ); } } @@ -639,7 +639,7 @@ void ScreenEvaluation::Init() bool bOneHasFullW2Combo = false; bool bOneHasFullW3Combo = false; bool bOneHasFullW4Combo = false; - + FOREACH_PlayerNumber( p ) { if(GAMESTATE->IsPlayerEnabled(p)) @@ -666,7 +666,7 @@ void ScreenEvaluation::Init() Grade best_grade = Grade_NoData; FOREACH_PlayerNumber( p ) - best_grade = min( best_grade, grade[p] ); + best_grade = min( best_grade, grade[p] ); if( m_pStageStats->m_EarnedExtraStage != EarnedExtraStage_No ) { @@ -799,7 +799,7 @@ void ScreenEvaluation::HandleMenuStart() // lua start #include "LuaBinding.h" -/** @brief Allow Lua to have access to the ScreenEvaluation. */ +/** @brief Allow Lua to have access to the ScreenEvaluation. */ class LunaScreenEvaluation: public Luna { public: @@ -817,7 +817,7 @@ LUA_REGISTER_DERIVED_CLASS( ScreenEvaluation, ScreenWithMenuElements ) /* * (c) 2001-2004 Chris Danford * All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -827,7 +827,7 @@ LUA_REGISTER_DERIVED_CLASS( ScreenEvaluation, ScreenWithMenuElements ) * copyright notice(s) and this permission notice appear in all copies of * the Software and that both the above copyright notice(s) and this * permission notice appear in supporting documentation. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF diff --git a/src/ScreenOptionsEditCourse.cpp b/src/ScreenOptionsEditCourse.cpp index 599f4a88f3..d7ad5eb665 100644 --- a/src/ScreenOptionsEditCourse.cpp +++ b/src/ScreenOptionsEditCourse.cpp @@ -311,7 +311,7 @@ void ScreenOptionsEditCourse::ExportOptions( int iRow, const vectorm_pCurCourse->m_fGoalSeconds = 0; int mins; if( sscanf( sValue, "%d", &mins ) == 1 ) - GAMESTATE->m_pCurCourse->m_fGoalSeconds = mins * 60; + GAMESTATE->m_pCurCourse->m_fGoalSeconds = float(mins * 60); break; } } diff --git a/src/StepMania.cpp b/src/StepMania.cpp index 018ab7923c..926dcea122 100644 --- a/src/StepMania.cpp +++ b/src/StepMania.cpp @@ -1628,8 +1628,8 @@ int LuaFunc_SaveScreenshot(lua_State *L) // If pn is provided, save to that player's profile. // Otherwise, save to the machine. PlayerNumber pn= Enum::Check(L, 1, true); - bool compress= lua_toboolean(L, 2); - bool sign= lua_toboolean(L, 3); + bool compress= lua_toboolean(L, 2) > 0; + bool sign= lua_toboolean(L, 3) > 0; RString prefix= luaL_optstring(L, 4, ""); RString suffix= luaL_optstring(L, 5, ""); RString dir;