actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix warnings

Browse Source
This commit is contained in:
Steve Checkoway
2003-12-10 16:42:02 +00:00
parent 4f75f0e174
commit d5844e93c9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PaneDisplay.cpp
+1 -1
View File
@@ -269,7 +269,7 @@ void PaneDisplay::SetContent( PaneContents c )
const CString metric = ITEM_COLOR(g_Contents[c].name, p); const CString metric = ITEM_COLOR(g_Contents[c].name, p);
CStringArray spec; CStringArray spec;
split( metric, ";", spec ); split( metric, ";", spec );
LOG->Trace("%i/%i, '%s', %i, max '%s'", p, num, metric.c_str(), spec.size(), spec[0].c_str() ); LOG->Trace("%i/%i, '%s', %zu, max '%s'", p, num, metric.c_str(), spec.size(), spec[0].c_str() );
if( spec.size() < 2 ) if( spec.size() < 2 )
RageException::Throw( "Metric '%s' malformed", metric.c_str() ); RageException::Throw( "Metric '%s' malformed", metric.c_str() );
const float n = (float) atof( spec[0] ); const float n = (float) atof( spec[0] );
stepmania/src/RageDisplay_OGL.cpp
+1 -1
View File
@@ -1042,7 +1042,7 @@ bool RageDisplay_OGL::IsZWriteEnabled() const
bool RageDisplay_OGL::IsZTestEnabled() const bool RageDisplay_OGL::IsZTestEnabled() const
{ {
GLenum a; GLenum a;
glGetIntegerv( GL_DEPTH_FUNC, (int*)&a ); glGetIntegerv( GL_DEPTH_FUNC, (GLint*)&a );
return a != GL_ALWAYS; return a != GL_ALWAYS;
} }
stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+1 -1
View File
@@ -278,7 +278,7 @@ int FFMpeg_Helper::DecodePacket()
{ {
if ( GetNextTimestamp ) if ( GetNextTimestamp )
{ {
if (pkt.pts != AV_NOPTS_VALUE) if (pkt.pts != int(AV_NOPTS_VALUE))
pts = (float)pkt.pts * m_fctx->pts_num / m_fctx->pts_den; pts = (float)pkt.pts * m_fctx->pts_num / m_fctx->pts_den;
else else
pts = -1; pts = -1;