Browse Source

engine: common: mark AbortCurrentFrame as NORETURN, fix noreturn warnings

pull/2/head
Alibek Omarov 3 years ago
parent
commit
86a777880f
  1. 2
      engine/common/common.h
  2. 2
      engine/common/host.c

2
engine/common/common.h

@ -691,7 +691,7 @@ int EXPORT Host_Main( int argc, char **argv, const char *progname, int bChangeGa
int Host_CompareFileTime( int ft1, int ft2 ); int Host_CompareFileTime( int ft1, int ft2 );
void Host_NewInstance( const char *name, const char *finalmsg ); void Host_NewInstance( const char *name, const char *finalmsg );
void Host_EndGame( qboolean abort, const char *message, ... ) _format( 2 ); void Host_EndGame( qboolean abort, const char *message, ... ) _format( 2 );
void Host_AbortCurrentFrame( void ); void Host_AbortCurrentFrame( void ) NORETURN;
void Host_WriteServerConfig( const char *name ); void Host_WriteServerConfig( const char *name );
void Host_WriteOpenGLConfig( void ); void Host_WriteOpenGLConfig( void );
void Host_WriteVideoConfig( void ); void Host_WriteVideoConfig( void );

2
engine/common/host.c

@ -721,7 +721,6 @@ void GAME_EXPORT Host_Error( const char *error, ... )
else if( host.framecount == host.errorframe ) else if( host.framecount == host.errorframe )
{ {
Sys_Error( "Host_MultiError: %s", hosterror2 ); Sys_Error( "Host_MultiError: %s", hosterror2 );
return;
} }
else else
{ {
@ -741,7 +740,6 @@ void GAME_EXPORT Host_Error( const char *error, ... )
{ {
Con_Printf( "Host_RecursiveError: %s", hosterror2 ); Con_Printf( "Host_RecursiveError: %s", hosterror2 );
Sys_Error( "%s", hosterror1 ); Sys_Error( "%s", hosterror1 );
return; // don't multiple executes
} }
recursive = true; recursive = true;

Loading…
Cancel
Save