X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_input.c;h=f92087c56fe9843c5d5c38cdff6a97e735ac90a6;hb=35a3584692580acad93906b098a36685c480deae;hp=f3432d2230a5022a153e6daf128d261a1c408ea6;hpb=9f880106429414ac1dd6024c83c49f5d2d49641c;p=xonotic%2Fdarkplaces.git diff --git a/cl_input.c b/cl_input.c index f3432d22..f92087c5 100644 --- a/cl_input.c +++ b/cl_input.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -59,8 +59,8 @@ int in_impulse; void KeyDown (kbutton_t *b) { - int k; - char *c; + int k; + const char *c; c = Cmd_Argv(1); if (c[0]) @@ -70,7 +70,7 @@ void KeyDown (kbutton_t *b) if (k == b->down[0] || k == b->down[1]) return; // repeating key - + if (!b->down[0]) b->down[0] = k; else if (!b->down[1]) @@ -80,7 +80,7 @@ void KeyDown (kbutton_t *b) Con_Printf ("Three keys down for a button!\n"); return; } - + if (b->state & 1) return; // still down b->state |= 1 + 2; // down + impulse down @@ -88,9 +88,9 @@ void KeyDown (kbutton_t *b) void KeyUp (kbutton_t *b) { - int k; - char *c; - + int k; + const char *c; + c = Cmd_Argv(1); if (c[0]) k = atoi(c); @@ -119,10 +119,11 @@ void KeyUp (kbutton_t *b) void IN_KLookDown (void) {KeyDown(&in_klook);} void IN_KLookUp (void) {KeyUp(&in_klook);} void IN_MLookDown (void) {KeyDown(&in_mlook);} -void IN_MLookUp (void) { -KeyUp(&in_mlook); -if ( !(in_mlook.state&1) && lookspring.value) - V_StartPitchDrift(); +void IN_MLookUp (void) +{ + KeyUp(&in_mlook); + if ( !(in_mlook.state&1) && lookspring.value) + V_StartPitchDrift(); } void IN_UpDown(void) {KeyDown(&in_up);} void IN_UpUp(void) {KeyUp(&in_up);} @@ -154,12 +155,18 @@ void IN_AttackDown(void) {KeyDown(&in_attack);} void IN_AttackUp(void) {KeyUp(&in_attack);} // LordHavoc: added 6 new buttons -void IN_Button3Down(void) {KeyDown(&in_button3);} void IN_Button3Up(void) {KeyUp(&in_button3);} -void IN_Button4Down(void) {KeyDown(&in_button4);} void IN_Button4Up(void) {KeyUp(&in_button4);} -void IN_Button5Down(void) {KeyDown(&in_button5);} void IN_Button5Up(void) {KeyUp(&in_button5);} -void IN_Button6Down(void) {KeyDown(&in_button6);} void IN_Button6Up(void) {KeyUp(&in_button6);} -void IN_Button7Down(void) {KeyDown(&in_button7);} void IN_Button7Up(void) {KeyUp(&in_button7);} -void IN_Button8Down(void) {KeyDown(&in_button8);} void IN_Button8Up(void) {KeyUp(&in_button8);} +void IN_Button3Down(void) {KeyDown(&in_button3);} +void IN_Button3Up(void) {KeyUp(&in_button3);} +void IN_Button4Down(void) {KeyDown(&in_button4);} +void IN_Button4Up(void) {KeyUp(&in_button4);} +void IN_Button5Down(void) {KeyDown(&in_button5);} +void IN_Button5Up(void) {KeyUp(&in_button5);} +void IN_Button6Down(void) {KeyDown(&in_button6);} +void IN_Button6Up(void) {KeyUp(&in_button6);} +void IN_Button7Down(void) {KeyDown(&in_button7);} +void IN_Button7Up(void) {KeyUp(&in_button7);} +void IN_Button8Down(void) {KeyDown(&in_button8);} +void IN_Button8Up(void) {KeyUp(&in_button8);} void IN_UseDown (void) {KeyDown(&in_use);} void IN_UseUp (void) {KeyUp(&in_use);} @@ -182,12 +189,12 @@ float CL_KeyState (kbutton_t *key) { float val; qboolean impulsedown, impulseup, down; - + impulsedown = key->state & 2; impulseup = key->state & 4; down = key->state & 1; val = 0; - + if (impulsedown && !impulseup) { if (down) @@ -218,7 +225,7 @@ float CL_KeyState (kbutton_t *key) } key->state &= 1; // clear impulses - + return val; } @@ -227,17 +234,17 @@ float CL_KeyState (kbutton_t *key) //========================================================================== -cvar_t cl_upspeed = {"cl_upspeed","200"}; -cvar_t cl_forwardspeed = {"cl_forwardspeed","200", true}; -cvar_t cl_backspeed = {"cl_backspeed","200", true}; -cvar_t cl_sidespeed = {"cl_sidespeed","350"}; +cvar_t cl_upspeed = {CVAR_SAVE, "cl_upspeed","400"}; +cvar_t cl_forwardspeed = {CVAR_SAVE, "cl_forwardspeed","400"}; +cvar_t cl_backspeed = {CVAR_SAVE, "cl_backspeed","400"}; +cvar_t cl_sidespeed = {CVAR_SAVE, "cl_sidespeed","350"}; -cvar_t cl_movespeedkey = {"cl_movespeedkey","2.0"}; +cvar_t cl_movespeedkey = {CVAR_SAVE, "cl_movespeedkey","2.0"}; -cvar_t cl_yawspeed = {"cl_yawspeed","140"}; -cvar_t cl_pitchspeed = {"cl_pitchspeed","150"}; +cvar_t cl_yawspeed = {CVAR_SAVE, "cl_yawspeed","140"}; +cvar_t cl_pitchspeed = {CVAR_SAVE, "cl_pitchspeed","150"}; -cvar_t cl_anglespeedkey = {"cl_anglespeedkey","1.5"}; +cvar_t cl_anglespeedkey = {CVAR_SAVE, "cl_anglespeedkey","1.5"}; /* @@ -251,17 +258,16 @@ void CL_AdjustAngles (void) { float speed; float up, down; - + if (in_speed.state & 1) - speed = host_frametime * cl_anglespeedkey.value; + speed = cl.frametime * cl_anglespeedkey.value; else - speed = host_frametime; + speed = cl.frametime; if (!(in_strafe.state & 1)) { cl.viewangles[YAW] -= speed*cl_yawspeed.value*CL_KeyState (&in_right); cl.viewangles[YAW] += speed*cl_yawspeed.value*CL_KeyState (&in_left); - cl.viewangles[YAW] = anglemod(cl.viewangles[YAW]); } if (in_klook.state & 1) { @@ -269,28 +275,28 @@ void CL_AdjustAngles (void) cl.viewangles[PITCH] -= speed*cl_pitchspeed.value * CL_KeyState (&in_forward); cl.viewangles[PITCH] += speed*cl_pitchspeed.value * CL_KeyState (&in_back); } - + up = CL_KeyState (&in_lookup); down = CL_KeyState(&in_lookdown); - + cl.viewangles[PITCH] -= speed*cl_pitchspeed.value * up; cl.viewangles[PITCH] += speed*cl_pitchspeed.value * down; if (up || down) V_StopPitchDrift (); - // LordHavoc: changed from 80 to 90 (straight up) - if (cl.viewangles[PITCH] > 90) - cl.viewangles[PITCH] = 90; - // LordHavoc: changed from -70 to -90 (straight down) - if (cl.viewangles[PITCH] < -90) - cl.viewangles[PITCH] = -90; - - if (cl.viewangles[ROLL] > 50) - cl.viewangles[ROLL] = 50; - if (cl.viewangles[ROLL] < -50) - cl.viewangles[ROLL] = -50; - + cl.viewangles[YAW] = ANGLEMOD(cl.viewangles[YAW]); + cl.viewangles[PITCH] = ANGLEMOD(cl.viewangles[PITCH]); + cl.viewangles[ROLL] = ANGLEMOD(cl.viewangles[ROLL]); + if (cl.viewangles[YAW] >= 180) + cl.viewangles[YAW] -= 360; + if (cl.viewangles[PITCH] >= 180) + cl.viewangles[PITCH] -= 360; + if (cl.viewangles[ROLL] >= 180) + cl.viewangles[ROLL] -= 360; + + cl.viewangles[PITCH] = bound (in_pitch_min.value, cl.viewangles[PITCH], in_pitch_max.value); + cl.viewangles[ROLL] = bound(-50, cl.viewangles[ROLL], 50); } /* @@ -301,14 +307,14 @@ Send the intended movement message to the server ================ */ void CL_BaseMove (usercmd_t *cmd) -{ +{ if (cls.signon != SIGNONS) return; - + CL_AdjustAngles (); - + memset (cmd, 0, sizeof(*cmd)); - + if (in_strafe.state & 1) { cmd->sidemove += cl_sidespeed.value * CL_KeyState (&in_right); @@ -322,10 +328,10 @@ void CL_BaseMove (usercmd_t *cmd) cmd->upmove -= cl_upspeed.value * CL_KeyState (&in_down); if (! (in_klook.state & 1) ) - { + { cmd->forwardmove += cl_forwardspeed.value * CL_KeyState (&in_forward); cmd->forwardmove -= cl_backspeed.value * CL_KeyState (&in_back); - } + } // // adjust for speed key @@ -345,12 +351,12 @@ void CL_BaseMove (usercmd_t *cmd) CL_SendMove ============== */ -void CL_SendMove (usercmd_t *cmd) +void CL_SendMove(usercmd_t *cmd) { - int i; - int bits; - sizebuf_t buf; - byte data[128]; + int i; + int bits; + sizebuf_t buf; + qbyte data[128]; static double lastmovetime; static float forwardmove, sidemove, upmove, total; // accumulation @@ -372,17 +378,20 @@ void CL_SendMove (usercmd_t *cmd) buf.maxsize = 128; buf.cursize = 0; buf.data = data; - + cl.cmd = *cmd; -// -// send the movement message -// - MSG_WriteByte (&buf, clc_move); + // send the movement message + MSG_WriteByte (&buf, clc_move); MSG_WriteFloat (&buf, cl.mtime[0]); // so server can get ping times - if (dpprotocol) + if (dpprotocol == DPPROTOCOL_VERSION2 || dpprotocol == DPPROTOCOL_VERSION3) + { + for (i = 0;i < 3;i++) + MSG_WriteFloat (&buf, cl.viewangles[i]); + } + else if (dpprotocol == DPPROTOCOL_VERSION1) { for (i=0 ; i<3 ; i++) MSG_WritePreciseAngle (&buf, cl.viewangles[i]); @@ -392,21 +401,19 @@ void CL_SendMove (usercmd_t *cmd) for (i=0 ; i<3 ; i++) MSG_WriteAngle (&buf, cl.viewangles[i]); } - - MSG_WriteShort (&buf, forwardmove); - MSG_WriteShort (&buf, sidemove); - MSG_WriteShort (&buf, upmove); + + MSG_WriteShort (&buf, forwardmove); + MSG_WriteShort (&buf, sidemove); + MSG_WriteShort (&buf, upmove); forwardmove = sidemove = upmove = 0; -// -// send button bits -// + // send button bits bits = 0; - + if ( in_attack.state & 3 ) bits |= 1; in_attack.state &= ~2; - + if (in_jump.state & 3) bits |= 2; in_jump.state &= ~2; @@ -417,29 +424,32 @@ void CL_SendMove (usercmd_t *cmd) if (in_button6.state & 3) bits |= 32;in_button6.state &= ~2; if (in_button7.state & 3) bits |= 64;in_button7.state &= ~2; if (in_button8.state & 3) bits |= 128;in_button8.state &= ~2; - - MSG_WriteByte (&buf, bits); - MSG_WriteByte (&buf, in_impulse); + MSG_WriteByte (&buf, bits); + + MSG_WriteByte (&buf, in_impulse); in_impulse = 0; -// -// deliver the message -// + // LordHavoc: should we ack this on receipt instead? would waste net bandwidth though + i = EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase); + if (i > 0) + { + MSG_WriteByte(&buf, clc_ackentities); + MSG_WriteLong(&buf, i); + } + + // deliver the message if (cls.demoplayback) return; -// -// allways dump the first two message, because it may contain leftover inputs -// from the last level -// + // always dump the first two messages, because they may contain leftover inputs from the last level if (++cl.movemessages <= 2) return; - if (NET_SendUnreliableMessage (cls.netcon, &buf) == -1) + if (NetConn_SendUnreliableMessage(cls.netcon, &buf) == -1) { - Con_Printf ("CL_SendMove: lost server connection\n"); - CL_Disconnect (); + Con_Printf("CL_SendMove: lost server connection\n"); + CL_Disconnect(); } } @@ -500,3 +510,4 @@ void CL_InitInput (void) Cmd_AddCommand ("+button8", IN_Button8Down); Cmd_AddCommand ("-button8", IN_Button8Up); } +