Remove a few useless comments from CSQC_UpdateView. Move scoreboard_pos declaration...

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 0a1772fc47d8aa501aa90f13e21655d214e52d94..855d20f818fbf7d04028cd255ec5067f42ab25f8 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1591,7 +1591,6 @@ void CSQC_UpdateView(entity this, float w, float h)
                current_player = player_localnum;
        myteam = entcs_GetTeam(current_player);
 
                current_player = player_localnum;
        myteam = entcs_GetTeam(current_player);
 

-       // abused multiple places below

        entity local_player = ((csqcplayer) ? csqcplayer : CSQCModel_server2csqc(player_localentnum - 1));
        if(!local_player)
                local_player = this; // fall back!
        entity local_player = ((csqcplayer) ? csqcplayer : CSQCModel_server2csqc(player_localentnum - 1));
        if(!local_player)
                local_player = this; // fall back!


@@ -1675,7 +1674,6 @@ void CSQC_UpdateView(entity this, float w, float h)
        // Draw the World (and sky)
        setproperty(VF_DRAWWORLD, 1);
 
        // Draw the World (and sky)
        setproperty(VF_DRAWWORLD, 1);
 

-       // Set the console size vars

        vid_conwidth = autocvar_vid_conwidth;
        vid_conheight = autocvar_vid_conheight;
        vid_pixelheight = autocvar_vid_pixelheight;
        vid_conwidth = autocvar_vid_conwidth;
        vid_conheight = autocvar_vid_conheight;
        vid_pixelheight = autocvar_vid_pixelheight;


@@ -1684,18 +1682,8 @@ void CSQC_UpdateView(entity this, float w, float h)
 
        View_DemoCamera();
 
 
        View_DemoCamera();
 

-       // Draw the Crosshair
-       setproperty(VF_DRAWCROSSHAIR, 0); //Make sure engine crosshairs are always hidden
-
-       // Draw the Engine Status Bar (the default Quake HUD)
-       setproperty(VF_DRAWENGINESBAR, 0);
-
-       // Update the mouse position
-       /*
-          mousepos_x = vid_conwidth;
-          mousepos_y = vid_conheight;
-          mousepos = mousepos*0.5 + getmousepos();
-        */
+       setproperty(VF_DRAWCROSSHAIR, 0); // hide engine crosshair
+       setproperty(VF_DRAWENGINESBAR, 0); // hide engine status bar

 
        IL_EACH(g_drawables, it.draw, it.draw(it));
 
 
        IL_EACH(g_drawables, it.draw, it.draw(it));
 

diff --git a/qcsrc/common/playerstats.qh b/qcsrc/common/playerstats.qh
index 4e52b83e0951f7d76ddd001c0216da8e770675e3..06feced27bc5ca66305f999f86d2a9eacf884a46 100644 (file)
--- a/qcsrc/common/playerstats.qh
+++ b/qcsrc/common/playerstats.qh
@@ -86,6 +86,7 @@ void PlayerStats_GameReport(float finished);
 void PlayerStats_GameReport_Handler(entity fh, entity pass, float status);
 
 .string playerstats_id;
 void PlayerStats_GameReport_Handler(entity fh, entity pass, float status);
 
 .string playerstats_id;

+.float scoreboard_pos;

 
 //string autocvar_g_playerstats_uri;
 
 
 //string autocvar_g_playerstats_uri;
 

diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh
index 2287815f5acd2e43fc8c7b24d443344a83b28040..178181cbada248a0ee7e55f5da55b8583d09d6ea 100644 (file)
--- a/qcsrc/server/scores.qh
+++ b/qcsrc/server/scores.qh
@@ -5,7 +5,6 @@
 bool autocvar_g_full_getstatus_responses;
 
 entity scores_initialized; // non-NULL when scores labels/rules have been set
 bool autocvar_g_full_getstatus_responses;
 
 entity scores_initialized; // non-NULL when scores labels/rules have been set

-.float scoreboard_pos;

 
 /**
  * Attaches a PlayerScore entity to a player. Use that in ClientConnect.
 
 /**
  * Attaches a PlayerScore entity to a player. Use that in ClientConnect.