Merge branch 'advanced-renderer-upgrades' of github.com:RobertBeckebans/RBDOOM-3-BFG into advanced-renderer-upgrades

This commit is contained in:
Robert Beckebans 2014-05-10 15:30:55 +02:00
commit 12fd563fce
3 changed files with 3 additions and 2032 deletions

View file

@ -382,7 +382,7 @@ void idRenderLog::OpenBlock( const char* label )
//if( logFile != NULL )
if( r_logFile.GetInteger() != 0 )
{
LogOpenBlock( RENDER_LOG_INDENT_MAIN_BLOCK, label, NULL );
LogOpenBlock( RENDER_LOG_INDENT_MAIN_BLOCK, "%s", label );
}
}
@ -451,7 +451,7 @@ void idRenderLog::Printf( const char* fmt, ... )
idRenderLog::LogOpenBlock
========================
*/
void idRenderLog::LogOpenBlock( renderLogIndentLabel_t label, const char* fmt, va_list args )
void idRenderLog::LogOpenBlock( renderLogIndentLabel_t label, const char* fmt, ... )
{
uint64 now = Sys_Microseconds();

View file

@ -125,7 +125,7 @@ public:
logStats_t logStats[MAX_LOG_LEVELS];
int logLevel;
void LogOpenBlock( renderLogIndentLabel_t label, const char* fmt, va_list args );
void LogOpenBlock( renderLogIndentLabel_t label, const char* fmt, ... );
void LogCloseBlock( renderLogIndentLabel_t label );
};

File diff suppressed because it is too large Load diff