r_refdef.vieworg and r_refdef.viewangles replaced by r_refdef.viewentitymatrix

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index 7682a9571fea60ea32dd9c0f05f36da8cd8b88e4..c588db9d9c05ae4470b60d66c45a9b7ec2042a70 100644 (file)
--- a/client.h
+++ b/client.h
@@ -308,6 +308,9 @@ extern client_static_t      cls;
 //
 typedef struct
 {
+       // true if playing in a local game and no one else is connected
+       int islocalgame;
+
        // when connecting to the server throw out the first couple move messages
        // so the player doesn't accidentally do something the first frame
        int movemessages;
@@ -325,6 +328,8 @@ typedef struct
        int items;
        // cl.time of acquiring item, for blinking
        float item_gettime[32];
+       // cl.time of changing STAT_ACTIVEWEAPON
+       float weapontime;
        // use pain anim frame if cl.time < this
        float faceanimtime;
 
@@ -422,8 +427,12 @@ typedef struct
        // for interpolation
        float viewzoomold, viewzoomnew;
 
+       // protocol version of the server we're connected to
+       int protocol;
+
        // entity database stuff
        entity_database_t entitydatabase;
+       entity_database4_t *entitydatabase4;
 }
 client_state_t;
 
@@ -526,7 +535,7 @@ extern      kbutton_t       in_strafe;
 extern         kbutton_t       in_speed;
 
 void CL_InitInput (void);
-void CL_SendCmd (void);
+void CL_SendCmd (usercmd_t *cmd);
 void CL_SendMove (usercmd_t *cmd);
 
 void CL_LerpUpdate(entity_t *e);
@@ -627,9 +636,8 @@ typedef struct
        int x, y, width, height;
        float fov_x, fov_y;
 
-       // view point
-       vec3_t vieworg;
-       vec3_t viewangles;
+       // view transform
+       matrix4x4_t viewentitymatrix;
 
        // fullscreen color blend
        float viewblend[4];