Ticket #35: fix_trac_35_v2.patch

File fix_trac_35_v2.patch, 1.7 KB (added by ilag, 10 years ago)

Added fix for displaying countdown timer.

  • code/cgame/cg_draw.c

    diff --git a/code/cgame/cg_draw.c b/code/cgame/cg_draw.c
    index 4a5009d..dc588c0 100644
    a b static void CG_Draw2D(stereoFrame_t stereoFrame) 
    41894189                return;
    41904190        }
    41914191
     4192#ifdef SMOKINGUNS
     4193    // iLag -- Draw the game restart timer when the round is over.
     4194    // Needs to be here or the intermission checker will override it.
     4195        if ( !CG_DrawFollow() ) {
     4196                if(cg_warmupmessage.integer)
     4197                        CG_DrawWarmup();
     4198        }
     4199#endif
     4200
    41924201        if ( cg.snap->ps.pm_type == PM_INTERMISSION ) {
    41934202                CG_DrawIntermission();
    41944203                return;
    static void CG_Draw2D(stereoFrame_t stereoFrame) 
    42414250        // Draw chat messages
    42424251        CG_DrawChatMessages();
    42434252
    4244         if ( !CG_DrawFollow() ) {
    4245                 if(cg_warmupmessage.integer)
    4246                         CG_DrawWarmup();
    4247         }
    4248 
    42494253        CG_DrawSpectator();
    42504254
    42514255        CG_ScanForCrosshairEntity( &changeCrosshair, &isPlayer );
  • code/game/g_main.c

    diff --git a/code/game/g_main.c b/code/game/g_main.c
    index 71e8318..70b5b3e 100644
    a b void ClearDuelData(qboolean all); 
    15801580void ExitLevel (void) {
    15811581        int             i;
    15821582        gclient_t *cl;
    1583 #ifndef SMOKINGUNS
    15841583        char nextmap[MAX_STRING_CHARS];
     1584#ifndef SMOKINGUNS
    15851585        char d1[MAX_STRING_CHARS];
    15861586#endif
    15871587
    void ExitLevel (void) { 
    16121612                trap_SendConsoleCommand( EXEC_APPEND, "vstr nextmap\n" );
    16131613        }
    16141614#else
    1615         trap_SendConsoleCommand( EXEC_APPEND, "vstr nextmap\n" );
     1615        trap_Cvar_VariableStringBuffer( "nextmap", nextmap, sizeof(nextmap) );
     1616    if ( Q_stricmp( nextmap , "" ) ){
     1617        trap_SendConsoleCommand( EXEC_APPEND, "vstr nextmap\n" );
     1618    } else {
     1619        Com_Printf("No nextmap specified!  Restarting current map in 5 seconds.\n");
     1620        trap_SendConsoleCommand( EXEC_APPEND, "map_restart 5\n" );
     1621    }
    16161622#endif
    16171623
    16181624        level.changemap = NULL;