rename meshes to draws in r_speeds report

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index c1699bba16fd4a9fe216eb822330f712926f92e4..3fcec6a20665484c98ae65a9a4926f55fbbf33dd 100644 (file)
--- a/client.h
+++ b/client.h
@@ -537,7 +537,7 @@ qw_downloadtype_t;
 typedef enum capturevideoformat_e
 {
        CAPTUREVIDEOFORMAT_AVI_I420,
-       CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA,
+       CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA
 }
 capturevideoformat_t;
 
@@ -710,8 +710,14 @@ typedef struct client_static_s
        // password spectator name team skin topcolor bottomcolor rate noaim msg *ver *ip
        char userinfo[MAX_USERINFO_STRING];
 
+       // extra user info for the "connect" command
+       char connect_userinfo[MAX_USERINFO_STRING];
+
        // video capture stuff
        capturevideostate_t capturevideo;
+
+       // crypto channel
+       crypto_t crypto;
 }
 client_static_t;
 
@@ -977,9 +983,9 @@ typedef struct client_state_s
        qboolean oldonground;
        double lastongroundtime;
        double hitgroundtime;
-
-       // used by bobside and bobroll
-       float bobside_airtime;
+       float bob2_smooth;
+       float bobfall_speed;
+       float bobfall_swing;
 
        // don't change view angle, full screen, etc
        int intermission;
@@ -1200,6 +1206,7 @@ typedef struct client_state_s
        float movevars_airstrafeaccel_qw;
        float movevars_aircontrol;
        float movevars_aircontrol_power;
+       float movevars_aircontrol_penalty;
        float movevars_warsowbunny_airforwardaccel;
        float movevars_warsowbunny_accel;
        float movevars_warsowbunny_topspeed;
@@ -1333,7 +1340,7 @@ void CL_Locs_FindLocationName(char *buffer, size_t buffersize, vec3_t point);
 void CL_Shutdown (void);
 void CL_Init (void);
 
-void CL_EstablishConnection(const char *host);
+void CL_EstablishConnection(const char *host, int firstarg);
 
 void CL_Disconnect (void);
 void CL_Disconnect_f (void);
@@ -1541,8 +1548,9 @@ typedef struct r_refdef_stats_s
        int particles;
        int drawndecals;
        int totaldecals;
-       int meshes;
-       int meshes_elements;
+       int draws;
+       int draws_vertices;
+       int draws_elements;
        int lights;
        int lights_clears;
        int lights_scissored;
@@ -1774,7 +1782,7 @@ typedef struct r_refdef_s
        float fog_height_texcoordscale;
        char fogheighttexturename[64]; // detects changes to active fog height texture
 
-       qboolean draw2dstage;
+       int draw2dstage; // 0 = no, 1 = yes, other value = needs setting up again
 
        // true during envmap command capture
        qboolean envmap;