Merge remote-tracking branch 'origin/terencehill/cmd_fixes'
authorSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:52:52 +0000 (16:52 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:52:52 +0000 (16:52 -0500)
Conflicts:
qcsrc/client/scoreboard.qc
qcsrc/server/g_world.qc

1  2 
qcsrc/client/command/cl_cmd.qc
qcsrc/client/scoreboard.qc
qcsrc/common/util.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/g_world.qc

Simple merge
@@@ -341,10 -339,9 +341,10 @@@ void Cmd_HUD_SetFields(float argc
  
        hud_num_fields = 0;
  
-       hud_fontsize = HUD_GetFontsize("hud_fontsize"); 
+       hud_fontsize = HUD_GetFontsize("hud_fontsize");
  
-       for(i = 0; i < argc - 1; ++i)
 +      draw_beginBoldFont();
+       for(i = 1; i < argc - 1; ++i)
        {
                float nocomplain;
                str = argv(i+1);
Simple merge
Simple merge
@@@ -831,9 -817,6 +831,9 @@@ void spawnfunc_worldspawn (void
        addstat(STAT_SECRETS_TOTAL, AS_FLOAT, stat_secrets_total);
        addstat(STAT_SECRETS_FOUND, AS_FLOAT, stat_secrets_found);
  
-       
 +      // misc
 +      addstat(STAT_RESPAWN_TIME, AS_FLOAT, stat_respawn_time);
++
        next_pingtime = time + 5;
  
        detect_maptype();