X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=client.h;h=2ab8079c991786b1683073dfa8fe5fe06695b319;hb=b035320854424884c174e6b33092f63c4158a3a3;hp=8b9298df64ce376d11987fdfd46fb21037321253;hpb=f42800577ad4cfda0aca780d1f7d28b4c2aaa14c;p=xonotic%2Fdarkplaces.git

diff --git a/client.h b/client.h
index 8b9298df..2ab8079c 100644
--- 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,6 +710,9 @@ 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;
 }
@@ -978,8 +981,8 @@ typedef struct client_state_s
 	double lastongroundtime;
 	double hitgroundtime;
 	float bob2_smooth;
-	
-	float ground_hit_speed;
+	float bobfall_speed;
+	float bobfall_swing;
 
 	// don't change view angle, full screen, etc
 	int intermission;
@@ -1200,6 +1203,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 +1337,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);
@@ -1774,7 +1778,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;