X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=client.h;h=a9a1eb36492cfbdd3009f6e048e41d87a489c1c4;hb=2c621a3fc48dfd1468517616a24a2c1207f53317;hp=75af05c88a70e753b2bfdd5e32669e279c6b7c0b;hpb=f61fa5e99b4d2ef1bf8af59e243d6a083cd43e97;p=xonotic%2Fdarkplaces.git

diff --git a/client.h b/client.h
index 75af05c8..a9a1eb36 100644
--- a/client.h
+++ b/client.h
@@ -234,7 +234,7 @@ typedef struct effect_s
 	vec3_t origin;
 	double starttime;
 	float framerate;
-	int modelindex;
+	dp_model_t *model;
 	int startframe;
 	int endframe;
 	// these are for interpolation
@@ -1158,7 +1158,6 @@ typedef struct client_state_s
 	float sensitivityscale;
 	csqc_vidvars_t csqc_vidvars;	//[515]: these parms must be set to true by default
 	qboolean csqc_wantsmousemove;
-	qboolean csqc_paused; // vortex: int because could be flags
 	struct model_s *csqc_model_precache[MAX_MODELS];
 
 	// local amount for smoothing stepups
@@ -1459,13 +1458,13 @@ client_state_t;
 //
 // cvars
 //
-extern cvar_t name;
+extern cvar_t cl_name;
 extern cvar_t cl_color;
-extern cvar_t rate;
-extern cvar_t rate_burstsize;
-extern cvar_t pmodel;
-extern cvar_t playermodel;
-extern cvar_t playerskin;
+extern cvar_t cl_rate;
+extern cvar_t cl_rate_burstsize;
+extern cvar_t cl_pmodel;
+extern cvar_t cl_playermodel;
+extern cvar_t cl_playerskin;
 
 extern cvar_t rcon_password;
 extern cvar_t rcon_address;
@@ -1534,6 +1533,8 @@ void CL_Locs_FindLocationName(char *buffer, size_t buffersize, vec3_t point);
 // cl_main
 //
 
+double CL_Frame(double time);
+
 void CL_Shutdown (void);
 void CL_Init (void);
 
@@ -1575,7 +1576,7 @@ void CL_ClientMovement_Replay(void);
 void CL_ClearTempEntities (void);
 entity_render_t *CL_NewTempEntity (double shadertime);
 
-void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate);
+void CL_Effect(vec3_t org, dp_model_t *model, int startframe, int framecount, float framerate);
 
 void CL_ClearState (void);
 void CL_ExpandEntities(int num);
@@ -1593,6 +1594,20 @@ float CL_KeyState (kbutton_t *key);
 const char *Key_KeynumToString (int keynum, char *buf, size_t buflength);
 int Key_StringToKeynum (const char *str);
 
+//
+// cl_cmd.c
+//
+/// adds the string as a clc_stringcmd to the client message.
+/// (used when there is no reason to generate a local command to do it)
+void CL_ForwardToServer (const char *s);
+
+/// adds the current command line as a clc_stringcmd to the client message.
+/// things like godmode, noclip, etc, are commands directed to the server,
+/// so when they are typed in at the console, they will need to be forwarded.
+void CL_ForwardToServer_f (cmd_state_t *cmd);
+void CL_InitCommands(void);
+
+
 //
 // cl_demo.c
 //
@@ -1630,7 +1645,6 @@ void V_StartPitchDrift_f(cmd_state_t *cmd);
 void V_StopPitchDrift (void);
 
 void V_Init (void);
-float V_CalcRoll (const vec3_t angles, const vec3_t velocity);
 void V_UpdateBlends (void);
 void V_ParseDamage (void);