war on -Werror, part 8: more informals.
General guide: if the parameter name and its typings match almost exactly, the name goes away. Otherwise, it's commented out to allow for some documentation.
This commit is contained in:
+5
-5
@@ -403,9 +403,9 @@ public:
|
|||||||
void AddRotationR( float rot );
|
void AddRotationR( float rot );
|
||||||
|
|
||||||
void SetSkewX( float fAmount ) { DestTweenState().fSkewX = fAmount; }
|
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; }
|
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 GetCropLeft() const { return DestTweenState().crop.left; }
|
||||||
float GetCropTop() const { return DestTweenState().crop.top; }
|
float GetCropTop() const { return DestTweenState().crop.top; }
|
||||||
@@ -602,10 +602,10 @@ public:
|
|||||||
|
|
||||||
// Animation
|
// Animation
|
||||||
virtual int GetNumStates() const { return 1; }
|
virtual int GetNumStates() const { return 1; }
|
||||||
virtual void SetState( int iNewState ) {}
|
virtual void SetState( int /* iNewState */ ) {}
|
||||||
virtual float GetAnimationLengthSeconds() const { return 0; }
|
virtual float GetAnimationLengthSeconds() const { return 0; }
|
||||||
virtual void SetSecondsIntoAnimation( float fSeconds ) {}
|
virtual void SetSecondsIntoAnimation( float ) {}
|
||||||
virtual void SetUpdateRate( float fRate ) {}
|
virtual void SetUpdateRate( float ) {}
|
||||||
|
|
||||||
HiddenPtr<LuaClass> m_pLuaInstance;
|
HiddenPtr<LuaClass> m_pLuaInstance;
|
||||||
|
|
||||||
|
|||||||
@@ -399,7 +399,7 @@ class OptionRowHandlerListNoteSkins : public OptionRowHandlerList
|
|||||||
// XXX: very similar to OptionRowHandlerSteps
|
// XXX: very similar to OptionRowHandlerSteps
|
||||||
class OptionRowHandlerListSteps : public OptionRowHandlerList
|
class OptionRowHandlerListSteps : public OptionRowHandlerList
|
||||||
{
|
{
|
||||||
virtual void LoadInternal( const Commands &cmds )
|
virtual void LoadInternal( const Commands & )
|
||||||
{
|
{
|
||||||
m_Def.m_sName = "Steps";
|
m_Def.m_sName = "Steps";
|
||||||
m_Def.m_bAllowThemeItems = false; // we theme the text ourself
|
m_Def.m_bAllowThemeItems = false; // we theme the text ourself
|
||||||
@@ -666,7 +666,7 @@ public:
|
|||||||
|
|
||||||
class OptionRowHandlerListCharacters: public OptionRowHandlerList
|
class OptionRowHandlerListCharacters: public OptionRowHandlerList
|
||||||
{
|
{
|
||||||
virtual void LoadInternal( const Commands &cmds )
|
virtual void LoadInternal( const Commands & )
|
||||||
{
|
{
|
||||||
m_Def.m_bOneChoiceForAllPlayers = false;
|
m_Def.m_bOneChoiceForAllPlayers = false;
|
||||||
m_Def.m_bAllowThemeItems = false;
|
m_Def.m_bAllowThemeItems = false;
|
||||||
@@ -699,7 +699,7 @@ class OptionRowHandlerListCharacters: public OptionRowHandlerList
|
|||||||
|
|
||||||
class OptionRowHandlerListStyles: 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_bOneChoiceForAllPlayers = true;
|
||||||
m_Def.m_sName = "Style";
|
m_Def.m_sName = "Style";
|
||||||
@@ -722,7 +722,7 @@ class OptionRowHandlerListStyles: public OptionRowHandlerList
|
|||||||
|
|
||||||
class OptionRowHandlerListGroups: 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_bOneChoiceForAllPlayers = true;
|
||||||
m_Def.m_bAllowThemeItems = false; // we theme the text ourself
|
m_Def.m_bAllowThemeItems = false; // we theme the text ourself
|
||||||
@@ -752,7 +752,7 @@ class OptionRowHandlerListGroups: public OptionRowHandlerList
|
|||||||
|
|
||||||
class OptionRowHandlerListDifficulties: 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_bOneChoiceForAllPlayers = true;
|
||||||
m_Def.m_sName = "Difficulty";
|
m_Def.m_sName = "Difficulty";
|
||||||
@@ -783,7 +783,7 @@ class OptionRowHandlerListDifficulties: public OptionRowHandlerList
|
|||||||
// XXX: very similar to OptionRowHandlerSongChoices
|
// XXX: very similar to OptionRowHandlerSongChoices
|
||||||
class OptionRowHandlerListSongsInCurrentSongGroup: public OptionRowHandlerList
|
class OptionRowHandlerListSongsInCurrentSongGroup: public OptionRowHandlerList
|
||||||
{
|
{
|
||||||
virtual void LoadInternal( const Commands &cmds )
|
virtual void LoadInternal( const Commands & )
|
||||||
{
|
{
|
||||||
const vector<Song*> &vpSongs = SONGMAN->GetSongs( GAMESTATE->m_sPreferredSongGroup );
|
const vector<Song*> &vpSongs = SONGMAN->GetSongs( GAMESTATE->m_sPreferredSongGroup );
|
||||||
|
|
||||||
@@ -1139,7 +1139,7 @@ public:
|
|||||||
|
|
||||||
m_Def.m_sName = m_pOpt->name;
|
m_Def.m_sName = m_pOpt->name;
|
||||||
}
|
}
|
||||||
virtual void ImportOption( OptionRow *pRow, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const
|
virtual void ImportOption( OptionRow *, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const
|
||||||
{
|
{
|
||||||
FOREACH_CONST( PlayerNumber, vpns, pn )
|
FOREACH_CONST( PlayerNumber, vpns, pn )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ public:
|
|||||||
RString OptionTitle() const;
|
RString OptionTitle() const;
|
||||||
RString GetThemedItemText( int iChoice ) 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
|
/* 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
|
* 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 ReloadChanged Reload() { return RELOAD_CHANGED_NONE; }
|
||||||
|
|
||||||
virtual int GetDefaultOption() const { return -1; }
|
virtual int GetDefaultOption() const { return -1; }
|
||||||
virtual void ImportOption( OptionRow *pRow, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const { }
|
virtual void ImportOption( OptionRow *, const vector<PlayerNumber> &, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const { }
|
||||||
// Returns an OPT mask.
|
// Returns an OPT mask.
|
||||||
virtual int ExportOption( const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const { return 0; }
|
virtual int ExportOption( const vector<PlayerNumber> &, const vector<bool> vbSelected[NUM_PLAYERS] ) const { return 0; }
|
||||||
virtual void GetIconTextAndGameCommand( int iFirstSelection, RString &sIconTextOut, GameCommand &gcOut ) const;
|
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. */
|
/** @brief Utilities for the OptionRowHandlers. */
|
||||||
|
|||||||
+5
-5
@@ -242,7 +242,7 @@ public:
|
|||||||
* DeleteTexture. (UpdateTexture is not permitted.) Returns 0 if render-to-
|
* DeleteTexture. (UpdateTexture is not permitted.) Returns 0 if render-to-
|
||||||
* texture is unsupported.
|
* 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
|
/* 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
|
* 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 */
|
void DrawQuad( const RageSpriteVertex v[] ) { DrawQuads(v,4); } /* alias. upper-left, upper-right, lower-left, lower-right */
|
||||||
|
|
||||||
// hacks for cell-shaded models
|
// hacks for cell-shaded models
|
||||||
virtual void SetPolygonMode( PolygonMode pm ) {}
|
virtual void SetPolygonMode( PolygonMode ) {}
|
||||||
virtual void SetLineWidth( float fWidth ) {}
|
virtual void SetLineWidth( float ) {}
|
||||||
|
|
||||||
enum GraphicsFileFormat
|
enum GraphicsFileFormat
|
||||||
{
|
{
|
||||||
@@ -311,9 +311,9 @@ public:
|
|||||||
};
|
};
|
||||||
bool SaveScreenshot( RString sPath, GraphicsFileFormat format );
|
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* 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:
|
protected:
|
||||||
virtual void DrawQuadsInternal( const RageSpriteVertex v[], int iNumVerts ) = 0;
|
virtual void DrawQuadsInternal( const RageSpriteVertex v[], int iNumVerts ) = 0;
|
||||||
|
|||||||
@@ -128,8 +128,8 @@ class RageCompiledGeometryNull : public RageCompiledGeometry
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
void Allocate( const vector<msMesh> &vMeshes ) {}
|
void Allocate( const vector<msMesh> & ) {}
|
||||||
void Change( const vector<msMesh> &vMeshes ) {}
|
void Change( const vector<msMesh> & ) {}
|
||||||
void Draw( int iMeshIndex ) const {}
|
void Draw( int iMeshIndex ) const {}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+17
-17
@@ -17,25 +17,25 @@ public:
|
|||||||
void EndFrame();
|
void EndFrame();
|
||||||
VideoModeParams GetActualVideoModeParams() const { return m_Params; }
|
VideoModeParams GetActualVideoModeParams() const { return m_Params; }
|
||||||
void SetBlendMode( BlendMode ) { }
|
void SetBlendMode( BlendMode ) { }
|
||||||
bool SupportsTextureFormat( PixelFormat, bool realtime=false ) { return true; }
|
bool SupportsTextureFormat( PixelFormat, bool /* realtime */ =false ) { return true; }
|
||||||
bool SupportsPerVertexMatrixScale() { return false; }
|
bool SupportsPerVertexMatrixScale() { return false; }
|
||||||
unsigned CreateTexture(
|
unsigned CreateTexture(
|
||||||
PixelFormat,
|
PixelFormat,
|
||||||
RageSurface* /* img */,
|
RageSurface* /* img */,
|
||||||
bool /* bGenerateMipMaps */ ) { return 1; }
|
bool /* bGenerateMipMaps */ ) { return 1; }
|
||||||
void UpdateTexture(
|
void UpdateTexture(
|
||||||
unsigned iTexHandle,
|
unsigned /* iTexHandle */,
|
||||||
RageSurface* img,
|
RageSurface* /* img */,
|
||||||
int xoffset, int yoffset, int width, int height
|
int /* xoffset */, int /* yoffset */, int /* width */, int /* height */
|
||||||
) { }
|
) { }
|
||||||
void DeleteTexture( unsigned /* iTexHandle */ ) { }
|
void DeleteTexture( unsigned /* iTexHandle */ ) { }
|
||||||
void ClearAllTextures() { }
|
void ClearAllTextures() { }
|
||||||
int GetNumTextureUnits() { return 1; }
|
int GetNumTextureUnits() { return 1; }
|
||||||
void SetTexture( TextureUnit tu, unsigned iTexture ) { }
|
void SetTexture( TextureUnit, unsigned /* iTexture */ ) { }
|
||||||
void SetTextureMode( TextureUnit tu, TextureMode tm ) { }
|
void SetTextureMode( TextureUnit, TextureMode ) { }
|
||||||
void SetTextureWrapping( TextureUnit tu, bool ) { }
|
void SetTextureWrapping( TextureUnit, bool ) { }
|
||||||
int GetMaxTextureSize() const { return 2048; }
|
int GetMaxTextureSize() const { return 2048; }
|
||||||
void SetTextureFiltering( TextureUnit tu, bool ) { }
|
void SetTextureFiltering( TextureUnit, bool ) { }
|
||||||
bool IsZWriteEnabled() const { return false; }
|
bool IsZWriteEnabled() const { return false; }
|
||||||
bool IsZTestEnabled() const { return false; }
|
bool IsZTestEnabled() const { return false; }
|
||||||
void SetZWrite( bool ) { }
|
void SetZWrite( bool ) { }
|
||||||
@@ -54,7 +54,7 @@ public:
|
|||||||
void SetLighting( bool ) { }
|
void SetLighting( bool ) { }
|
||||||
void SetLightOff( int /* index */ ) { }
|
void SetLightOff( int /* index */ ) { }
|
||||||
void SetLightDirectional(
|
void SetLightDirectional(
|
||||||
int index,
|
int /* index */,
|
||||||
const RageColor & /* unreferenced: ambient */,
|
const RageColor & /* unreferenced: ambient */,
|
||||||
const RageColor & /* unreferenced: diffuse */,
|
const RageColor & /* unreferenced: diffuse */,
|
||||||
const RageColor & /* unreferenced: specular */,
|
const RageColor & /* unreferenced: specular */,
|
||||||
@@ -67,14 +67,14 @@ public:
|
|||||||
void DeleteCompiledGeometry( RageCompiledGeometry* );
|
void DeleteCompiledGeometry( RageCompiledGeometry* );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void DrawQuadsInternal( const RageSpriteVertex v[], int iNumVerts ) { }
|
void DrawQuadsInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
||||||
void DrawQuadStripInternal( const RageSpriteVertex v[], int iNumVerts ) { }
|
void DrawQuadStripInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
||||||
void DrawFanInternal( const RageSpriteVertex v[], int iNumVerts ) { }
|
void DrawFanInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
||||||
void DrawStripInternal( const RageSpriteVertex v[], int iNumVerts ) { }
|
void DrawStripInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
||||||
void DrawTrianglesInternal( const RageSpriteVertex v[], int iNumVerts ) { }
|
void DrawTrianglesInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
||||||
void DrawCompiledGeometryInternal( const RageCompiledGeometry *p, int iMeshIndex ) { }
|
void DrawCompiledGeometryInternal( const RageCompiledGeometry *p, int /* iMeshIndex */ ) { }
|
||||||
void DrawLineStripInternal( const RageSpriteVertex v[], int iNumVerts, float LineWidth ) { }
|
void DrawLineStripInternal( const RageSpriteVertex v[], int /* iNumVerts */, float /* LineWidth */ ) { }
|
||||||
void DrawSymmetricQuadStripInternal( const RageSpriteVertex v[], int iNumVerts ) { }
|
void DrawSymmetricQuadStripInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
||||||
|
|
||||||
VideoModeParams m_Params;
|
VideoModeParams m_Params;
|
||||||
RString TryVideoMode( const VideoModeParams &p, bool & /* bNewDeviceOut */ ) { m_Params = p; return RString(); }
|
RString TryVideoMode( const VideoModeParams &p, bool & /* bNewDeviceOut */ ) { m_Params = p; return RString(); }
|
||||||
|
|||||||
+1
-1
@@ -98,7 +98,7 @@ public:
|
|||||||
virtual RageFileBasic *Copy() const { FAIL_M( "Copying unimplemented" ); }
|
virtual RageFileBasic *Copy() const { FAIL_M( "Copying unimplemented" ); }
|
||||||
|
|
||||||
protected:
|
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 ReadInternal( void *pBuffer, size_t iBytes ) = 0;
|
||||||
virtual int WriteInternal( const void *pBuffer, size_t iBytes ) = 0;
|
virtual int WriteInternal( const void *pBuffer, size_t iBytes ) = 0;
|
||||||
virtual int FlushInternal() { return 0; }
|
virtual int FlushInternal() { return 0; }
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ public:
|
|||||||
RageFileObjInflate( const RageFileObjInflate &cpy );
|
RageFileObjInflate( const RageFileObjInflate &cpy );
|
||||||
~RageFileObjInflate();
|
~RageFileObjInflate();
|
||||||
int ReadInternal( void *pBuffer, size_t iBytes );
|
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 SeekInternal( int iOffset );
|
||||||
int GetFileSize() const { return m_iUncompressedSize; }
|
int GetFileSize() const { return m_iUncompressedSize; }
|
||||||
int GetFD() { return m_pFile->GetFD(); }
|
int GetFD() { return m_pFile->GetFD(); }
|
||||||
@@ -47,7 +47,7 @@ public:
|
|||||||
void DeleteFileWhenFinished() { m_bFileOwned = true; }
|
void DeleteFileWhenFinished() { m_bFileOwned = true; }
|
||||||
|
|
||||||
protected:
|
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 WriteInternal( const void *pBuffer, size_t iBytes );
|
||||||
int FlushInternal();
|
int FlushInternal();
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ public:
|
|||||||
void DeleteFileWhenFinished() { m_bFileOwned = true; }
|
void DeleteFileWhenFinished() { m_bFileOwned = true; }
|
||||||
|
|
||||||
int ReadInternal( void *pBuffer, size_t iBytes );
|
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 SeekInternal( int iOffset );
|
||||||
int GetFileSize() const { return m_iFileSize; }
|
int GetFileSize() const { return m_iFileSize; }
|
||||||
int GetFD() { return m_pFile->GetFD(); }
|
int GetFD() { return m_pFile->GetFD(); }
|
||||||
|
|||||||
+5
-5
@@ -12,17 +12,17 @@ class RageTexture
|
|||||||
public:
|
public:
|
||||||
RageTexture( RageTextureID file );
|
RageTexture( RageTextureID file );
|
||||||
virtual ~RageTexture() = 0;
|
virtual ~RageTexture() = 0;
|
||||||
virtual void Update( float fDeltaTime ) {}
|
virtual void Update( float /* fDeltaTime */ ) {}
|
||||||
virtual void Reload() {}
|
virtual void Reload() {}
|
||||||
virtual void Invalidate() { } /* only called by RageTextureManager::InvalidateTextures */
|
virtual void Invalidate() { } /* only called by RageTextureManager::InvalidateTextures */
|
||||||
virtual unsigned GetTexHandle() const = 0; // accessed by RageDisplay
|
virtual unsigned GetTexHandle() const = 0; // accessed by RageDisplay
|
||||||
|
|
||||||
// movie texture/animated texture stuff
|
// movie texture/animated texture stuff
|
||||||
virtual void SetPosition( float fSeconds ) {} // seek
|
virtual void SetPosition( float /* fSeconds */ ) {} // seek
|
||||||
virtual void DecodeSeconds( float fSeconds ) {} // decode
|
virtual void DecodeSeconds( float /* fSeconds */ ) {} // decode
|
||||||
virtual void SetPlaybackRate( float fRate ) {}
|
virtual void SetPlaybackRate( float ) {}
|
||||||
virtual bool IsAMovie() const { return false; }
|
virtual bool IsAMovie() const { return false; }
|
||||||
virtual void SetLooping(bool looping) { }
|
virtual void SetLooping(bool) { }
|
||||||
|
|
||||||
int GetSourceWidth() const {return m_iSourceWidth;}
|
int GetSourceWidth() const {return m_iSourceWidth;}
|
||||||
int GetSourceHeight() const {return m_iSourceHeight;}
|
int GetSourceHeight() const {return m_iSourceHeight;}
|
||||||
|
|||||||
+3
-3
@@ -13,14 +13,14 @@ class ScoreDisplay : public ActorFrame
|
|||||||
public:
|
public:
|
||||||
virtual void Init( const PlayerState* pPlayerState, const PlayerStageStats* pPlayerStageStats );
|
virtual void Init( const PlayerState* pPlayerState, const PlayerStageStats* pPlayerStageStats );
|
||||||
|
|
||||||
virtual void SetScore( int iNewScore ) {}
|
virtual void SetScore( int ) {}
|
||||||
virtual void OnLoadSong() {};
|
virtual void OnLoadSong() {};
|
||||||
/* Notification of a tap note judgment. This *is* called for the head of
|
/* Notification of a tap note judgment. This *is* called for the head of
|
||||||
* hold notes. */
|
* hold notes. */
|
||||||
virtual void OnJudgment( TapNoteScore score ) {};
|
virtual void OnJudgment( TapNoteScore ) {};
|
||||||
/* Notification of a hold judgment. tscore is the score received for the
|
/* Notification of a hold judgment. tscore is the score received for the
|
||||||
* initial tap note. */
|
* initial tap note. */
|
||||||
virtual void OnJudgment( HoldNoteScore score, TapNoteScore tscore ) {};
|
virtual void OnJudgment( HoldNoteScore, TapNoteScore ) {};
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
const PlayerState* m_pPlayerState; // needed to look up stats
|
const PlayerState* m_pPlayerState; // needed to look up stats
|
||||||
|
|||||||
+10
-6
@@ -45,14 +45,18 @@ public:
|
|||||||
virtual void Update( float fDelta ) { }
|
virtual void Update( float fDelta ) { }
|
||||||
|
|
||||||
// Note that pNoteData will include any transformations due to modifiers.
|
// 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*
|
// HandleTap* is called before HandleTapRow*
|
||||||
virtual void HandleTapScore( const TapNote &tn ) { }
|
virtual void HandleTapScore( const TapNote & ) { }
|
||||||
virtual void HandleTapRowScore( const NoteData &nd, int iRow ) { }
|
virtual void HandleTapRowScore( const NoteData & /* nd */, int /* iRow */ ) { }
|
||||||
virtual void HandleHoldScore( const TapNote &tn ) { }
|
virtual void HandleHoldScore( const TapNote & ) { }
|
||||||
virtual void HandleHoldActiveSeconds( float fMusicSecondsHeld ) { }
|
virtual void HandleHoldActiveSeconds( float /* fMusicSecondsHeld */ ) { }
|
||||||
virtual void HandleHoldCheckpointScore( const NoteData &nd, int iRow, int iNumHoldsHeldThisRow, int iNumHoldsMissedThisRow ) { }
|
virtual void HandleHoldCheckpointScore(
|
||||||
|
const NoteData & /*nd */,
|
||||||
|
int /* iRow */,
|
||||||
|
int /* iNumHoldsHeldThisRow */,
|
||||||
|
int /* iNumHoldsMissedThisRow */ ) { }
|
||||||
virtual void HandleTapScoreNone() { }
|
virtual void HandleTapScoreNone() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ void ScoreKeeperNormal::Load(
|
|||||||
m_iRoundTo = 1;
|
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();
|
m_bIsBeginner = pSteps->GetDifficulty() == Difficulty_Beginner && !GAMESTATE->IsCourseMode();
|
||||||
|
|||||||
@@ -9,11 +9,11 @@ class ScoreKeeperRave : public ScoreKeeper
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScoreKeeperRave( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats );
|
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 HandleTapScore( const TapNote &tn );
|
||||||
void HandleTapRowScore( const NoteData &nd, int iRow );
|
void HandleTapRowScore( const NoteData &nd, int iRow );
|
||||||
void HandleHoldScore( const TapNote &tn );
|
void HandleHoldScore( const TapNote &tn );
|
||||||
void HandleHoldActiveSeconds( float fMusicSecondsHeld ) {}
|
void HandleHoldActiveSeconds( float /* fMusicSecondsHeld */ ) {}
|
||||||
void HandleTapScoreNone();
|
void HandleTapScoreNone();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
ScreenWithMenuElements::HandleScreenMessage( SM );
|
ScreenWithMenuElements::HandleScreenMessage( SM );
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenEditMenu::MenuUp( const InputEventPlus &input )
|
void ScreenEditMenu::MenuUp( const InputEventPlus & )
|
||||||
{
|
{
|
||||||
if( m_Selector.CanGoUp() )
|
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() )
|
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() )
|
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() )
|
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 STEPS_WILL_BE_LOST ( "ScreenEditMenu", "These steps will be lost permanently." );
|
||||||
static LocalizedString CONTINUE_WITH_DELETE ( "ScreenEditMenu", "Continue with delete?" );
|
static LocalizedString CONTINUE_WITH_DELETE ( "ScreenEditMenu", "Continue with delete?" );
|
||||||
static LocalizedString ENTER_EDIT_DESCRIPTION ( "ScreenEditMenu", "Enter a description for this edit.");
|
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() )
|
if( IsTransitioning() )
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -150,8 +150,8 @@ void ScreenNetworkOptions::MenuStart( const InputEventPlus &input )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenNetworkOptions::ImportOptions( int iRow, const vector<PlayerNumber> &vpns ) { }
|
void ScreenNetworkOptions::ImportOptions( int /* iRow */, const vector<PlayerNumber> & /* vpns */ ) { }
|
||||||
void ScreenNetworkOptions::ExportOptions( int iRow, const vector<PlayerNumber> &vpns ) { }
|
void ScreenNetworkOptions::ExportOptions( int /* iRow */, const vector<PlayerNumber> & /* vpns */ ) { }
|
||||||
|
|
||||||
void ScreenNetworkOptions::UpdateConnectStatus( )
|
void ScreenNetworkOptions::UpdateConnectStatus( )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -753,7 +753,7 @@ void ScreenOptions::AfterChangeValueOrRow( PlayerNumber pn )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ScreenOptions::MenuBack( const InputEventPlus &input )
|
void ScreenOptions::MenuBack( const InputEventPlus & )
|
||||||
{
|
{
|
||||||
Cancel( SM_GoToPrevScreen );
|
Cancel( SM_GoToPrevScreen );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,12 +88,12 @@ void ScreenOptionsExportPackage::ProcessMenuStart( const InputEventPlus &input )
|
|||||||
|
|
||||||
// todo: process menu back in SubGroup mode
|
// todo: process menu back in SubGroup mode
|
||||||
|
|
||||||
void ScreenOptionsExportPackage::ImportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
void ScreenOptionsExportPackage::ImportOptions( int /* iRow */, const vector<PlayerNumber> & /* vpns */ )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenOptionsExportPackage::ExportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
void ScreenOptionsExportPackage::ExportOptions( int /* iRow */, const vector<PlayerNumber> & /* vpns */ )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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_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." );
|
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() )
|
if( IsTransitioning() )
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -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_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." );
|
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() )
|
if( IsTransitioning() )
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -331,7 +331,7 @@ void ScreenOptionsManageProfiles::AfterChangeRow( PlayerNumber pn )
|
|||||||
ScreenOptions::AfterChangeRow( pn );
|
ScreenOptions::AfterChangeRow( pn );
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus &input )
|
void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus & )
|
||||||
{
|
{
|
||||||
if( IsTransitioning() )
|
if( IsTransitioning() )
|
||||||
return;
|
return;
|
||||||
@@ -392,12 +392,12 @@ void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus &input
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenOptionsManageProfiles::ImportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
void ScreenOptionsManageProfiles::ImportOptions( int /* iRow */, const vector<PlayerNumber> & /* vpns */ )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenOptionsManageProfiles::ExportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
void ScreenOptionsManageProfiles::ExportOptions( int /* iRow */, const vector<PlayerNumber> & /* vpns */ )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -187,7 +187,7 @@ void ScreenOptionsMemoryCard::SelectRowWithMemoryCard( const RString &sOsMountPo
|
|||||||
}
|
}
|
||||||
|
|
||||||
static LocalizedString ERROR_MOUNTING_CARD ("ScreenOptionsMemoryCard", "Error mounting card: %s" );
|
static LocalizedString ERROR_MOUNTING_CARD ("ScreenOptionsMemoryCard", "Error mounting card: %s" );
|
||||||
void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus &input )
|
void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus & )
|
||||||
{
|
{
|
||||||
if( IsTransitioning() )
|
if( IsTransitioning() )
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -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)
|
// Handle unselect song (ffff)
|
||||||
// todo: this isn't right at all. -aj
|
// todo: this isn't right at all. -aj
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public:
|
|||||||
|
|
||||||
// Override to find out whether the controller is currently plugged in.
|
// Override to find out whether the controller is currently plugged in.
|
||||||
// Not all InputHandlers will support this. Not applicable to all InputHandlers.
|
// 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.
|
/* In Windows, some devices need to be recreated if we recreate our main window.
|
||||||
* Override this if you need to do that. */
|
* Override this if you need to do that. */
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ protected:
|
|||||||
virtual void GetUSBStorageDevices( vector<UsbStorageDevice>& vDevicesOut ) { }
|
virtual void GetUSBStorageDevices( vector<UsbStorageDevice>& vDevicesOut ) { }
|
||||||
|
|
||||||
/* Test the device. On failure, call pDevice->SetError() appropriately, and return false. */
|
/* 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:
|
private:
|
||||||
vector<UsbStorageDevice> m_vDevicesLastSeen;
|
vector<UsbStorageDevice> m_vDevicesLastSeen;
|
||||||
|
|||||||
Reference in New Issue
Block a user