diff --git a/src/Actor.h b/src/Actor.h index 919d4994f7..ac30557190 100644 --- a/src/Actor.h +++ b/src/Actor.h @@ -403,9 +403,9 @@ public: void AddRotationR( float rot ); void SetSkewX( float fAmount ) { DestTweenState().fSkewX = fAmount; } - float GetSkewX( float fAmount ) const { return DestTweenState().fSkewX; } + float GetSkewX( float /* fAmount */ ) const { return DestTweenState().fSkewX; } void SetSkewY( float fAmount ) { DestTweenState().fSkewY = fAmount; } - float GetSkewY( float fAmount ) const { return DestTweenState().fSkewY; } + float GetSkewY( float /* fAmount */ ) const { return DestTweenState().fSkewY; } float GetCropLeft() const { return DestTweenState().crop.left; } float GetCropTop() const { return DestTweenState().crop.top; } @@ -602,10 +602,10 @@ public: // Animation virtual int GetNumStates() const { return 1; } - virtual void SetState( int iNewState ) {} + virtual void SetState( int /* iNewState */ ) {} virtual float GetAnimationLengthSeconds() const { return 0; } - virtual void SetSecondsIntoAnimation( float fSeconds ) {} - virtual void SetUpdateRate( float fRate ) {} + virtual void SetSecondsIntoAnimation( float ) {} + virtual void SetUpdateRate( float ) {} HiddenPtr m_pLuaInstance; diff --git a/src/OptionRowHandler.cpp b/src/OptionRowHandler.cpp index 0c63cf1086..b2c1bacf42 100644 --- a/src/OptionRowHandler.cpp +++ b/src/OptionRowHandler.cpp @@ -399,7 +399,7 @@ class OptionRowHandlerListNoteSkins : public OptionRowHandlerList // XXX: very similar to OptionRowHandlerSteps class OptionRowHandlerListSteps : public OptionRowHandlerList { - virtual void LoadInternal( const Commands &cmds ) + virtual void LoadInternal( const Commands & ) { m_Def.m_sName = "Steps"; m_Def.m_bAllowThemeItems = false; // we theme the text ourself @@ -666,7 +666,7 @@ public: class OptionRowHandlerListCharacters: public OptionRowHandlerList { - virtual void LoadInternal( const Commands &cmds ) + virtual void LoadInternal( const Commands & ) { m_Def.m_bOneChoiceForAllPlayers = false; m_Def.m_bAllowThemeItems = false; @@ -699,7 +699,7 @@ class OptionRowHandlerListCharacters: public OptionRowHandlerList class OptionRowHandlerListStyles: public OptionRowHandlerList { - virtual void LoadInternal( const Commands &cmds ) + virtual void LoadInternal( const Commands & ) { m_Def.m_bOneChoiceForAllPlayers = true; m_Def.m_sName = "Style"; @@ -722,7 +722,7 @@ class OptionRowHandlerListStyles: public OptionRowHandlerList class OptionRowHandlerListGroups: public OptionRowHandlerList { - virtual void LoadInternal( const Commands &cmds ) + virtual void LoadInternal( const Commands & ) { m_Def.m_bOneChoiceForAllPlayers = true; m_Def.m_bAllowThemeItems = false; // we theme the text ourself @@ -752,7 +752,7 @@ class OptionRowHandlerListGroups: public OptionRowHandlerList class OptionRowHandlerListDifficulties: public OptionRowHandlerList { - virtual void LoadInternal( const Commands &cmds ) + virtual void LoadInternal( const Commands & ) { m_Def.m_bOneChoiceForAllPlayers = true; m_Def.m_sName = "Difficulty"; @@ -783,7 +783,7 @@ class OptionRowHandlerListDifficulties: public OptionRowHandlerList // XXX: very similar to OptionRowHandlerSongChoices class OptionRowHandlerListSongsInCurrentSongGroup: public OptionRowHandlerList { - virtual void LoadInternal( const Commands &cmds ) + virtual void LoadInternal( const Commands & ) { const vector &vpSongs = SONGMAN->GetSongs( GAMESTATE->m_sPreferredSongGroup ); @@ -1139,7 +1139,7 @@ public: m_Def.m_sName = m_pOpt->name; } - virtual void ImportOption( OptionRow *pRow, const vector &vpns, vector vbSelectedOut[NUM_PLAYERS] ) const + virtual void ImportOption( OptionRow *, const vector &vpns, vector vbSelectedOut[NUM_PLAYERS] ) const { FOREACH_CONST( PlayerNumber, vpns, pn ) { diff --git a/src/OptionRowHandler.h b/src/OptionRowHandler.h index 3a443849ce..232ccafee6 100644 --- a/src/OptionRowHandler.h +++ b/src/OptionRowHandler.h @@ -158,7 +158,7 @@ public: RString OptionTitle() const; RString GetThemedItemText( int iChoice ) const; - virtual void LoadInternal( const Commands &cmds ) { } + virtual void LoadInternal( const Commands & ) { } /* We may re-use OptionRowHandlers. This is called before each use. If the * contents of the row are dependent on external state (for example, the @@ -173,11 +173,11 @@ public: virtual ReloadChanged Reload() { return RELOAD_CHANGED_NONE; } virtual int GetDefaultOption() const { return -1; } - virtual void ImportOption( OptionRow *pRow, const vector &vpns, vector vbSelectedOut[NUM_PLAYERS] ) const { } + virtual void ImportOption( OptionRow *, const vector &, vector vbSelectedOut[NUM_PLAYERS] ) const { } // Returns an OPT mask. - virtual int ExportOption( const vector &vpns, const vector vbSelected[NUM_PLAYERS] ) const { return 0; } + virtual int ExportOption( const vector &, const vector vbSelected[NUM_PLAYERS] ) const { return 0; } virtual void GetIconTextAndGameCommand( int iFirstSelection, RString &sIconTextOut, GameCommand &gcOut ) const; - virtual RString GetScreen( int iChoice ) const { return RString(); } + virtual RString GetScreen( int /* iChoice */ ) const { return RString(); } }; /** @brief Utilities for the OptionRowHandlers. */ diff --git a/src/RageDisplay.h b/src/RageDisplay.h index 2338fca0ae..3aa8f6e836 100644 --- a/src/RageDisplay.h +++ b/src/RageDisplay.h @@ -242,7 +242,7 @@ public: * DeleteTexture. (UpdateTexture is not permitted.) Returns 0 if render-to- * texture is unsupported. */ - virtual unsigned CreateRenderTarget( const RenderTargetParam ¶m, int &iTextureWidthOut, int &iTextureHeightOut ) { return 0; } + virtual unsigned CreateRenderTarget( const RenderTargetParam &, int & /* iTextureWidthOut */, int & /* iTextureHeightOut */ ) { return 0; } /* Set the render target, or 0 to resume rendering to the framebuffer. An active render * target may not be used as a texture. If bPreserveTexture is true, the contents @@ -299,8 +299,8 @@ public: void DrawQuad( const RageSpriteVertex v[] ) { DrawQuads(v,4); } /* alias. upper-left, upper-right, lower-left, lower-right */ // hacks for cell-shaded models - virtual void SetPolygonMode( PolygonMode pm ) {} - virtual void SetLineWidth( float fWidth ) {} + virtual void SetPolygonMode( PolygonMode ) {} + virtual void SetLineWidth( float ) {} enum GraphicsFileFormat { @@ -311,9 +311,9 @@ public: }; bool SaveScreenshot( RString sPath, GraphicsFileFormat format ); - virtual RString GetTextureDiagnostics( unsigned id ) const { return RString(); } + virtual RString GetTextureDiagnostics( unsigned /* id */ ) const { return RString(); } virtual RageSurface* CreateScreenshot() = 0; // allocates a surface. Caller must delete it. - virtual RageSurface *GetTexture( unsigned iTexture ) { return NULL; } // allocates a surface. Caller must delete it. + virtual RageSurface *GetTexture( unsigned /* iTexture */ ) { return NULL; } // allocates a surface. Caller must delete it. protected: virtual void DrawQuadsInternal( const RageSpriteVertex v[], int iNumVerts ) = 0; diff --git a/src/RageDisplay_Null.cpp b/src/RageDisplay_Null.cpp index 0815006dce..458ad8b14d 100644 --- a/src/RageDisplay_Null.cpp +++ b/src/RageDisplay_Null.cpp @@ -128,8 +128,8 @@ class RageCompiledGeometryNull : public RageCompiledGeometry { public: - void Allocate( const vector &vMeshes ) {} - void Change( const vector &vMeshes ) {} + void Allocate( const vector & ) {} + void Change( const vector & ) {} void Draw( int iMeshIndex ) const {} }; diff --git a/src/RageDisplay_Null.h b/src/RageDisplay_Null.h index b05e425ed2..4d2924d8f1 100644 --- a/src/RageDisplay_Null.h +++ b/src/RageDisplay_Null.h @@ -17,25 +17,25 @@ public: void EndFrame(); VideoModeParams GetActualVideoModeParams() const { return m_Params; } void SetBlendMode( BlendMode ) { } - bool SupportsTextureFormat( PixelFormat, bool realtime=false ) { return true; } + bool SupportsTextureFormat( PixelFormat, bool /* realtime */ =false ) { return true; } bool SupportsPerVertexMatrixScale() { return false; } unsigned CreateTexture( PixelFormat, RageSurface* /* img */, bool /* bGenerateMipMaps */ ) { return 1; } void UpdateTexture( - unsigned iTexHandle, - RageSurface* img, - int xoffset, int yoffset, int width, int height + unsigned /* iTexHandle */, + RageSurface* /* img */, + int /* xoffset */, int /* yoffset */, int /* width */, int /* height */ ) { } void DeleteTexture( unsigned /* iTexHandle */ ) { } void ClearAllTextures() { } int GetNumTextureUnits() { return 1; } - void SetTexture( TextureUnit tu, unsigned iTexture ) { } - void SetTextureMode( TextureUnit tu, TextureMode tm ) { } - void SetTextureWrapping( TextureUnit tu, bool ) { } + void SetTexture( TextureUnit, unsigned /* iTexture */ ) { } + void SetTextureMode( TextureUnit, TextureMode ) { } + void SetTextureWrapping( TextureUnit, bool ) { } int GetMaxTextureSize() const { return 2048; } - void SetTextureFiltering( TextureUnit tu, bool ) { } + void SetTextureFiltering( TextureUnit, bool ) { } bool IsZWriteEnabled() const { return false; } bool IsZTestEnabled() const { return false; } void SetZWrite( bool ) { } @@ -54,7 +54,7 @@ public: void SetLighting( bool ) { } void SetLightOff( int /* index */ ) { } void SetLightDirectional( - int index, + int /* index */, const RageColor & /* unreferenced: ambient */, const RageColor & /* unreferenced: diffuse */, const RageColor & /* unreferenced: specular */, @@ -67,14 +67,14 @@ public: void DeleteCompiledGeometry( RageCompiledGeometry* ); protected: - void DrawQuadsInternal( const RageSpriteVertex v[], int iNumVerts ) { } - void DrawQuadStripInternal( const RageSpriteVertex v[], int iNumVerts ) { } - void DrawFanInternal( const RageSpriteVertex v[], int iNumVerts ) { } - void DrawStripInternal( const RageSpriteVertex v[], int iNumVerts ) { } - void DrawTrianglesInternal( const RageSpriteVertex v[], int iNumVerts ) { } - void DrawCompiledGeometryInternal( const RageCompiledGeometry *p, int iMeshIndex ) { } - void DrawLineStripInternal( const RageSpriteVertex v[], int iNumVerts, float LineWidth ) { } - void DrawSymmetricQuadStripInternal( const RageSpriteVertex v[], int iNumVerts ) { } + void DrawQuadsInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { } + void DrawQuadStripInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { } + void DrawFanInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { } + void DrawStripInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { } + void DrawTrianglesInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { } + void DrawCompiledGeometryInternal( const RageCompiledGeometry *p, int /* iMeshIndex */ ) { } + void DrawLineStripInternal( const RageSpriteVertex v[], int /* iNumVerts */, float /* LineWidth */ ) { } + void DrawSymmetricQuadStripInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { } VideoModeParams m_Params; RString TryVideoMode( const VideoModeParams &p, bool & /* bNewDeviceOut */ ) { m_Params = p; return RString(); } diff --git a/src/RageFileBasic.h b/src/RageFileBasic.h index 75cff97cc6..7f3a44f9e9 100644 --- a/src/RageFileBasic.h +++ b/src/RageFileBasic.h @@ -98,7 +98,7 @@ public: virtual RageFileBasic *Copy() const { FAIL_M( "Copying unimplemented" ); } protected: - virtual int SeekInternal( int iOffset ) { FAIL_M( "Seeking unimplemented" ); } + virtual int SeekInternal( int /* iOffset */ ) { FAIL_M( "Seeking unimplemented" ); } virtual int ReadInternal( void *pBuffer, size_t iBytes ) = 0; virtual int WriteInternal( const void *pBuffer, size_t iBytes ) = 0; virtual int FlushInternal() { return 0; } diff --git a/src/RageFileDriverDeflate.h b/src/RageFileDriverDeflate.h index cc312b2ad8..92c7d57533 100644 --- a/src/RageFileDriverDeflate.h +++ b/src/RageFileDriverDeflate.h @@ -16,7 +16,7 @@ public: RageFileObjInflate( const RageFileObjInflate &cpy ); ~RageFileObjInflate(); int ReadInternal( void *pBuffer, size_t iBytes ); - int WriteInternal( const void *pBuffer, size_t iBytes ) { SetError( "Not implemented" ); return -1; } + int WriteInternal( const void * /* pBuffer */, size_t /* iBytes */ ) { SetError( "Not implemented" ); return -1; } int SeekInternal( int iOffset ); int GetFileSize() const { return m_iUncompressedSize; } int GetFD() { return m_pFile->GetFD(); } @@ -47,7 +47,7 @@ public: void DeleteFileWhenFinished() { m_bFileOwned = true; } protected: - int ReadInternal( void *pBuffer, size_t iBytes ) { SetError( "Not implemented" ); return -1; } + int ReadInternal( void * /* pBuffer */, size_t /* iBytes */ ) { SetError( "Not implemented" ); return -1; } int WriteInternal( const void *pBuffer, size_t iBytes ); int FlushInternal(); diff --git a/src/RageFileDriverSlice.h b/src/RageFileDriverSlice.h index 2464d221da..4898d87909 100644 --- a/src/RageFileDriverSlice.h +++ b/src/RageFileDriverSlice.h @@ -17,7 +17,7 @@ public: void DeleteFileWhenFinished() { m_bFileOwned = true; } int ReadInternal( void *pBuffer, size_t iBytes ); - int WriteInternal( const void *pBuffer, size_t iBytes ) { SetError( "Not implemented" ); return -1; } + int WriteInternal( const void * /* pBuffer */, size_t /* iBytes */ ) { SetError( "Not implemented" ); return -1; } int SeekInternal( int iOffset ); int GetFileSize() const { return m_iFileSize; } int GetFD() { return m_pFile->GetFD(); } diff --git a/src/RageTexture.h b/src/RageTexture.h index 0b81115358..10840c4a82 100644 --- a/src/RageTexture.h +++ b/src/RageTexture.h @@ -12,17 +12,17 @@ class RageTexture public: RageTexture( RageTextureID file ); virtual ~RageTexture() = 0; - virtual void Update( float fDeltaTime ) {} + virtual void Update( float /* fDeltaTime */ ) {} virtual void Reload() {} virtual void Invalidate() { } /* only called by RageTextureManager::InvalidateTextures */ virtual unsigned GetTexHandle() const = 0; // accessed by RageDisplay // movie texture/animated texture stuff - virtual void SetPosition( float fSeconds ) {} // seek - virtual void DecodeSeconds( float fSeconds ) {} // decode - virtual void SetPlaybackRate( float fRate ) {} + virtual void SetPosition( float /* fSeconds */ ) {} // seek + virtual void DecodeSeconds( float /* fSeconds */ ) {} // decode + virtual void SetPlaybackRate( float ) {} virtual bool IsAMovie() const { return false; } - virtual void SetLooping(bool looping) { } + virtual void SetLooping(bool) { } int GetSourceWidth() const {return m_iSourceWidth;} int GetSourceHeight() const {return m_iSourceHeight;} diff --git a/src/ScoreDisplay.h b/src/ScoreDisplay.h index 73a7713356..34bed24908 100644 --- a/src/ScoreDisplay.h +++ b/src/ScoreDisplay.h @@ -13,14 +13,14 @@ class ScoreDisplay : public ActorFrame public: virtual void Init( const PlayerState* pPlayerState, const PlayerStageStats* pPlayerStageStats ); - virtual void SetScore( int iNewScore ) {} + virtual void SetScore( int ) {} virtual void OnLoadSong() {}; /* Notification of a tap note judgment. This *is* called for the head of * hold notes. */ - virtual void OnJudgment( TapNoteScore score ) {}; + virtual void OnJudgment( TapNoteScore ) {}; /* Notification of a hold judgment. tscore is the score received for the * initial tap note. */ - virtual void OnJudgment( HoldNoteScore score, TapNoteScore tscore ) {}; + virtual void OnJudgment( HoldNoteScore, TapNoteScore ) {}; protected: const PlayerState* m_pPlayerState; // needed to look up stats diff --git a/src/ScoreKeeper.h b/src/ScoreKeeper.h index a0ea752bc9..53e6ede331 100644 --- a/src/ScoreKeeper.h +++ b/src/ScoreKeeper.h @@ -45,14 +45,18 @@ public: virtual void Update( float fDelta ) { } // Note that pNoteData will include any transformations due to modifiers. - virtual void OnNextSong( int iSongInCourseIndex, const Steps* pSteps, const NoteData* pNoteData ) { }; // before a song plays (called multiple times if course) + virtual void OnNextSong( int /* iSongInCourseIndex */, const Steps*, const NoteData* ) { }; // before a song plays (called multiple times if course) // HandleTap* is called before HandleTapRow* - virtual void HandleTapScore( const TapNote &tn ) { } - virtual void HandleTapRowScore( const NoteData &nd, int iRow ) { } - virtual void HandleHoldScore( const TapNote &tn ) { } - virtual void HandleHoldActiveSeconds( float fMusicSecondsHeld ) { } - virtual void HandleHoldCheckpointScore( const NoteData &nd, int iRow, int iNumHoldsHeldThisRow, int iNumHoldsMissedThisRow ) { } + virtual void HandleTapScore( const TapNote & ) { } + virtual void HandleTapRowScore( const NoteData & /* nd */, int /* iRow */ ) { } + virtual void HandleHoldScore( const TapNote & ) { } + virtual void HandleHoldActiveSeconds( float /* fMusicSecondsHeld */ ) { } + virtual void HandleHoldCheckpointScore( + const NoteData & /*nd */, + int /* iRow */, + int /* iNumHoldsHeldThisRow */, + int /* iNumHoldsMissedThisRow */ ) { } virtual void HandleTapScoreNone() { } protected: diff --git a/src/ScoreKeeperNormal.cpp b/src/ScoreKeeperNormal.cpp index 53a991a01c..59f8cc27b7 100644 --- a/src/ScoreKeeperNormal.cpp +++ b/src/ScoreKeeperNormal.cpp @@ -161,7 +161,7 @@ void ScoreKeeperNormal::Load( m_iRoundTo = 1; } -void ScoreKeeperNormal::OnNextSong( int iSongInCourseIndex, const Steps* pSteps, const NoteData* pNoteData ) +void ScoreKeeperNormal::OnNextSong( int, const Steps* pSteps, const NoteData* ) { m_bIsBeginner = pSteps->GetDifficulty() == Difficulty_Beginner && !GAMESTATE->IsCourseMode(); diff --git a/src/ScoreKeeperRave.h b/src/ScoreKeeperRave.h index 6b5473345d..3f8be61e69 100644 --- a/src/ScoreKeeperRave.h +++ b/src/ScoreKeeperRave.h @@ -9,11 +9,11 @@ class ScoreKeeperRave : public ScoreKeeper { public: ScoreKeeperRave( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats ); - void OnNextSong( int iSongInCourseIndex, const Steps *pSteps, const NoteData *pNoteData ) { } + void OnNextSong( int /* iSongInCourseIndex */, const Steps *, const NoteData * ) { } void HandleTapScore( const TapNote &tn ); void HandleTapRowScore( const NoteData &nd, int iRow ); void HandleHoldScore( const TapNote &tn ); - void HandleHoldActiveSeconds( float fMusicSecondsHeld ) {} + void HandleHoldActiveSeconds( float /* fMusicSecondsHeld */ ) {} void HandleTapScoreNone(); protected: diff --git a/src/ScreenEditMenu.cpp b/src/ScreenEditMenu.cpp index dba59d48b1..7158061e45 100644 --- a/src/ScreenEditMenu.cpp +++ b/src/ScreenEditMenu.cpp @@ -100,7 +100,7 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM ) ScreenWithMenuElements::HandleScreenMessage( SM ); } -void ScreenEditMenu::MenuUp( const InputEventPlus &input ) +void ScreenEditMenu::MenuUp( const InputEventPlus & ) { if( m_Selector.CanGoUp() ) { @@ -109,7 +109,7 @@ void ScreenEditMenu::MenuUp( const InputEventPlus &input ) } } -void ScreenEditMenu::MenuDown( const InputEventPlus &input ) +void ScreenEditMenu::MenuDown( const InputEventPlus & ) { if( m_Selector.CanGoDown() ) { @@ -118,7 +118,7 @@ void ScreenEditMenu::MenuDown( const InputEventPlus &input ) } } -void ScreenEditMenu::MenuLeft( const InputEventPlus &input ) +void ScreenEditMenu::MenuLeft( const InputEventPlus & ) { if( m_Selector.CanGoLeft() ) { @@ -126,7 +126,7 @@ void ScreenEditMenu::MenuLeft( const InputEventPlus &input ) } } -void ScreenEditMenu::MenuRight( const InputEventPlus &input ) +void ScreenEditMenu::MenuRight( const InputEventPlus & ) { if( m_Selector.CanGoRight() ) { @@ -157,7 +157,8 @@ static LocalizedString DELETED_AUTOGEN_STEPS ( "ScreenEditMenu", "These steps ar static LocalizedString STEPS_WILL_BE_LOST ( "ScreenEditMenu", "These steps will be lost permanently." ); static LocalizedString CONTINUE_WITH_DELETE ( "ScreenEditMenu", "Continue with delete?" ); static LocalizedString ENTER_EDIT_DESCRIPTION ( "ScreenEditMenu", "Enter a description for this edit."); -void ScreenEditMenu::MenuStart( const InputEventPlus &input ) + +void ScreenEditMenu::MenuStart( const InputEventPlus & ) { if( IsTransitioning() ) return; diff --git a/src/ScreenNetworkOptions.cpp b/src/ScreenNetworkOptions.cpp index 02d6cf4f8e..63600603fe 100644 --- a/src/ScreenNetworkOptions.cpp +++ b/src/ScreenNetworkOptions.cpp @@ -150,8 +150,8 @@ void ScreenNetworkOptions::MenuStart( const InputEventPlus &input ) } } -void ScreenNetworkOptions::ImportOptions( int iRow, const vector &vpns ) { } -void ScreenNetworkOptions::ExportOptions( int iRow, const vector &vpns ) { } +void ScreenNetworkOptions::ImportOptions( int /* iRow */, const vector & /* vpns */ ) { } +void ScreenNetworkOptions::ExportOptions( int /* iRow */, const vector & /* vpns */ ) { } void ScreenNetworkOptions::UpdateConnectStatus( ) { diff --git a/src/ScreenOptions.cpp b/src/ScreenOptions.cpp index 3e1e126fc6..c8f984a1d1 100644 --- a/src/ScreenOptions.cpp +++ b/src/ScreenOptions.cpp @@ -753,7 +753,7 @@ void ScreenOptions::AfterChangeValueOrRow( PlayerNumber pn ) } -void ScreenOptions::MenuBack( const InputEventPlus &input ) +void ScreenOptions::MenuBack( const InputEventPlus & ) { Cancel( SM_GoToPrevScreen ); } diff --git a/src/ScreenOptionsExportPackage.cpp b/src/ScreenOptionsExportPackage.cpp index 7b003a6529..777c94cd0a 100644 --- a/src/ScreenOptionsExportPackage.cpp +++ b/src/ScreenOptionsExportPackage.cpp @@ -88,12 +88,12 @@ void ScreenOptionsExportPackage::ProcessMenuStart( const InputEventPlus &input ) // todo: process menu back in SubGroup mode -void ScreenOptionsExportPackage::ImportOptions( int iRow, const vector &vpns ) +void ScreenOptionsExportPackage::ImportOptions( int /* iRow */, const vector & /* vpns */ ) { } -void ScreenOptionsExportPackage::ExportOptions( int iRow, const vector &vpns ) +void ScreenOptionsExportPackage::ExportOptions( int /* iRow */, const vector & /* vpns */ ) { } diff --git a/src/ScreenOptionsManageCourses.cpp b/src/ScreenOptionsManageCourses.cpp index 40a0bbcdfa..dc6431a6c4 100644 --- a/src/ScreenOptionsManageCourses.cpp +++ b/src/ScreenOptionsManageCourses.cpp @@ -213,7 +213,7 @@ void ScreenOptionsManageCourses::MenuSelect( const InputEventPlus &input ) static LocalizedString YOU_HAVE_MAX( "ScreenOptionsManageCourses", "You have %d, the maximum number allowed." ); static LocalizedString YOU_MUST_DELETE( "ScreenOptionsManageCourses", "You must delete an existing before creating a new." ); -void ScreenOptionsManageCourses::ProcessMenuStart( const InputEventPlus &input ) +void ScreenOptionsManageCourses::ProcessMenuStart( const InputEventPlus & ) { if( IsTransitioning() ) return; diff --git a/src/ScreenOptionsManageEditSteps.cpp b/src/ScreenOptionsManageEditSteps.cpp index b4a48702ee..16c20d224f 100644 --- a/src/ScreenOptionsManageEditSteps.cpp +++ b/src/ScreenOptionsManageEditSteps.cpp @@ -240,7 +240,7 @@ void ScreenOptionsManageEditSteps::AfterChangeRow( PlayerNumber pn ) static LocalizedString YOU_HAVE_MAX_STEP_EDITS( "ScreenOptionsManageEditSteps", "You have %d step edits, the maximum number allowed." ); static LocalizedString YOU_MUST_DELETE( "ScreenOptionsManageEditSteps", "You must delete an existing steps edit before creating a new steps edit." ); -void ScreenOptionsManageEditSteps::ProcessMenuStart( const InputEventPlus &input ) +void ScreenOptionsManageEditSteps::ProcessMenuStart( const InputEventPlus & ) { if( IsTransitioning() ) return; diff --git a/src/ScreenOptionsManageProfiles.cpp b/src/ScreenOptionsManageProfiles.cpp index adb2cbf917..40331ddac8 100644 --- a/src/ScreenOptionsManageProfiles.cpp +++ b/src/ScreenOptionsManageProfiles.cpp @@ -331,7 +331,7 @@ void ScreenOptionsManageProfiles::AfterChangeRow( PlayerNumber pn ) ScreenOptions::AfterChangeRow( pn ); } -void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus &input ) +void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus & ) { if( IsTransitioning() ) return; @@ -392,12 +392,12 @@ void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus &input } } -void ScreenOptionsManageProfiles::ImportOptions( int iRow, const vector &vpns ) +void ScreenOptionsManageProfiles::ImportOptions( int /* iRow */, const vector & /* vpns */ ) { } -void ScreenOptionsManageProfiles::ExportOptions( int iRow, const vector &vpns ) +void ScreenOptionsManageProfiles::ExportOptions( int /* iRow */, const vector & /* vpns */ ) { } diff --git a/src/ScreenOptionsMemoryCard.cpp b/src/ScreenOptionsMemoryCard.cpp index c0bfa6351b..dea7444c81 100644 --- a/src/ScreenOptionsMemoryCard.cpp +++ b/src/ScreenOptionsMemoryCard.cpp @@ -187,7 +187,7 @@ void ScreenOptionsMemoryCard::SelectRowWithMemoryCard( const RString &sOsMountPo } static LocalizedString ERROR_MOUNTING_CARD ("ScreenOptionsMemoryCard", "Error mounting card: %s" ); -void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus &input ) +void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus & ) { if( IsTransitioning() ) return; diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index 52e4e7a4f8..f0e1e7b103 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -1493,7 +1493,7 @@ void ScreenSelectMusic::MenuStart( const InputEventPlus &input ) } -void ScreenSelectMusic::MenuBack( const InputEventPlus &input ) +void ScreenSelectMusic::MenuBack( const InputEventPlus & /* input */ ) { // Handle unselect song (ffff) // todo: this isn't right at all. -aj diff --git a/src/arch/InputHandler/InputHandler.h b/src/arch/InputHandler/InputHandler.h index 3564a73552..2afaa75066 100644 --- a/src/arch/InputHandler/InputHandler.h +++ b/src/arch/InputHandler/InputHandler.h @@ -38,7 +38,7 @@ public: // Override to find out whether the controller is currently plugged in. // Not all InputHandlers will support this. Not applicable to all InputHandlers. - virtual InputDeviceState GetInputDeviceState( InputDevice id ) { return InputDeviceState_Connected; } + virtual InputDeviceState GetInputDeviceState( InputDevice /* id */ ) { return InputDeviceState_Connected; } /* In Windows, some devices need to be recreated if we recreate our main window. * Override this if you need to do that. */ diff --git a/src/arch/MemoryCard/MemoryCardDriver.h b/src/arch/MemoryCard/MemoryCardDriver.h index cc60e313a8..642d5436e3 100644 --- a/src/arch/MemoryCard/MemoryCardDriver.h +++ b/src/arch/MemoryCard/MemoryCardDriver.h @@ -96,7 +96,7 @@ protected: virtual void GetUSBStorageDevices( vector& vDevicesOut ) { } /* Test the device. On failure, call pDevice->SetError() appropriately, and return false. */ - virtual bool TestWrite( UsbStorageDevice* pDevice ) { return true; } + virtual bool TestWrite( UsbStorageDevice* ) { return true; } private: vector m_vDevicesLastSeen;