diff --git a/source/cl_main.c b/source/cl_main.c index 11a87cc..fee59a4 100644 --- a/source/cl_main.c +++ b/source/cl_main.c @@ -35,7 +35,7 @@ cvar_t cl_nolerp = {"cl_nolerp","0"}; cvar_t lookspring = {"lookspring","0", true}; cvar_t lookstrafe = {"lookstrafe","0", true}; -cvar_t sensitivity = {"sensitivity","3", true}; +cvar_t sensitivity = {"sensitivity","8", true}; cvar_t in_tolerance = {"tolerance","0.25", true}; cvar_t in_acceleration = {"acceleration","1.0", true}; cvar_t in_analog_strafe = {"in_analog_strafe", "0", true}; diff --git a/source/gl_draw.c b/source/gl_draw.c index add176c..668a2e1 100644 --- a/source/gl_draw.c +++ b/source/gl_draw.c @@ -1143,19 +1143,19 @@ void Draw_Crosshair (void) x_value = (vid.width - 3)/2 - crosshair_offset_step; y_value = (vid.height - 1)/2; - Draw_FillByColor(x_value, y_value, 3, 1, 255, (int)col, (int)col, 255); + Draw_FillByColor(x_value, y_value, 3, 1, 255, (int)col, (int)col, crosshair_opacity); x_value = (vid.width - 3)/2 + crosshair_offset_step; y_value = (vid.height - 1)/2; - Draw_FillByColor(x_value, y_value, 3, 1, 255, (int)col, (int)col, 255); + Draw_FillByColor(x_value, y_value, 3, 1, 255, (int)col, (int)col, crosshair_opacity); x_value = (vid.width - 1)/2; y_value = (vid.height - 3)/2 - crosshair_offset_step; - Draw_FillByColor(x_value, y_value, 1, 3, 255, (int)col, (int)col, 255); + Draw_FillByColor(x_value, y_value, 1, 3, 255, (int)col, (int)col, crosshair_opacity); x_value = (vid.width - 1)/2; y_value = (vid.height - 3)/2 + crosshair_offset_step; - Draw_FillByColor(x_value, y_value, 1, 3, 255, (int)col, (int)col, 255); + Draw_FillByColor(x_value, y_value, 1, 3, 255, (int)col, (int)col, crosshair_opacity); } // Area of Effect (o) else if (crosshair.value == 2) { diff --git a/source/in_null.c b/source/in_null.c index b1569f0..6e2a089 100644 --- a/source/in_null.c +++ b/source/in_null.c @@ -25,6 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern int bind_grab; extern bool new3ds_flag; +extern bool croshhairmoving; +extern float crosshair_opacity; extern cvar_t in_analog_strafe; extern cvar_t in_x_axis_adjust; @@ -137,18 +139,36 @@ void IN_Move (usercmd_t *cmd) if (new3ds_flag) { float move_x, move_y; - cl_backspeed = cl_forwardspeed = cl_sidespeed = sv_player->v.maxspeed*1.2; + cl_backspeed = cl_forwardspeed = cl_sidespeed = sv_player->v.maxspeed; cl_sidespeed *= 0.8; cl_backspeed *= 0.7; - if (left.dx > 0) - move_x = IN_CalcInput(left.dx, cl_forwardspeed, deadZone, acceleration); + move_x = IN_CalcInput(left.dx, cl_sidespeed, deadZone, acceleration); + + if (left.dy > 0) + move_y = IN_CalcInput(left.dy, cl_forwardspeed, deadZone, acceleration); else - move_x = IN_CalcInput(left.dx, cl_backspeed, deadZone, acceleration); - move_y = IN_CalcInput(left.dy, cl_sidespeed, deadZone, acceleration); + move_y = IN_CalcInput(left.dy, cl_backspeed, deadZone, acceleration); cmd->sidemove += move_x; cmd->forwardmove += move_y; + + Con_Printf("%d\n", left.dx); + + // crosshair stuff + if (left.dx < 50 && left.dx > -50 && left.dy < 50 && left.dy > -50) { + croshhairmoving = false; + + crosshair_opacity += 22; + + if (crosshair_opacity >= 255) + crosshair_opacity = 255; + } else { + croshhairmoving = true; + crosshair_opacity -= 8; + if (crosshair_opacity <= 128) + crosshair_opacity = 128; + } } }