From 086b1b9329a1f7b763b8722848f7597ad588c9db Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 11 May 2007 12:07:42 +0000 Subject: [PATCH] g_balance_jumpvelocity -> sv_jumpheight git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2542 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 2 +- data/physics15.cfg | 4 ++-- data/physics151.cfg | 4 ++-- data/physics151b.cfg | 4 ++-- data/physics16rc1.cfg | 4 ++-- data/physicsQ.cfg | 4 ++-- data/physicsQ3.cfg | 4 ++-- data/physicsQBF.cfg | 4 ++-- data/physicsQBFplus.cfg | 4 ++-- data/physicsQBR.cfg | 4 ++-- data/qcsrc/server/cl_client.qc | 2 +- data/qcsrc/server/cl_physics.qc | 2 +- data/qcsrc/server/havocbot.qc | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/data/default.cfg b/data/default.cfg index 92a071cd8..8fdaed822 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -138,7 +138,7 @@ cl_upspeed $sv_maxspeed cl_movement_accelerate $sv_accelerate cl_movement_edgefriction $edgefriction cl_movement_friction $sv_friction -cl_movement_jumpvelocity $g_balance_jumpheight +cl_movement_jumpvelocity $sv_jumpvelocity cl_movement_maxairspeed $sv_maxairspeed cl_movement_maxspeed $sv_maxspeed cl_movement_stepheight $sv_stepheight diff --git a/data/physics15.cfg b/data/physics15.cfg index 61f97ecd2..772f45bef 100644 --- a/data/physics15.cfg +++ b/data/physics15.cfg @@ -3,9 +3,9 @@ sv_maxairspeed 50 sv_accelerate 5.5 sv_airaccelerate 5.5 sv_friction 5 -edgefriction 0 +edgefriction 1 sv_stepheight 34 -set g_balance_jumpheight 300 +set sv_jumpvelocity 300 set sv_friction_on_land 0.25 set sv_airaccel_sideways_friction 0 set sv_airaccel_qw 0 diff --git a/data/physics151.cfg b/data/physics151.cfg index 3e7506837..80b887ffb 100644 --- a/data/physics151.cfg +++ b/data/physics151.cfg @@ -3,9 +3,9 @@ sv_maxairspeed 50 sv_accelerate 5.5 sv_airaccelerate 5.5 sv_friction 5 -edgefriction 0 +edgefriction 1 sv_stepheight 34 -set g_balance_jumpheight 300 +set sv_jumpvelocity 300 set sv_friction_on_land 0 set sv_airaccel_sideways_friction 0 set sv_airaccel_qw 0 diff --git a/data/physics151b.cfg b/data/physics151b.cfg index da0d7d227..a1768ee61 100644 --- a/data/physics151b.cfg +++ b/data/physics151b.cfg @@ -3,9 +3,9 @@ sv_maxairspeed 25 sv_accelerate 5.5 sv_airaccelerate 5.5 sv_friction 5 -edgefriction 0 +edgefriction 1 sv_stepheight 34 -set g_balance_jumpheight 300 +set sv_jumpvelocity 300 set sv_friction_on_land 0 set sv_airaccel_sideways_friction 0 set sv_airaccel_qw 0 diff --git a/data/physics16rc1.cfg b/data/physics16rc1.cfg index 68252c8bf..8c7a10e4c 100644 --- a/data/physics16rc1.cfg +++ b/data/physics16rc1.cfg @@ -3,9 +3,9 @@ sv_maxairspeed 50 sv_accelerate 5.5 sv_airaccelerate 5.5 sv_friction 5 -edgefriction 0 +edgefriction 1 sv_stepheight 34 -set g_balance_jumpheight 300 +set sv_jumpvelocity 300 set sv_friction_on_land 0.2 set sv_airaccel_sideways_friction 0 set sv_airaccel_qw 0 diff --git a/data/physicsQ.cfg b/data/physicsQ.cfg index c032bfd18..e37bac080 100644 --- a/data/physicsQ.cfg +++ b/data/physicsQ.cfg @@ -3,9 +3,9 @@ sv_maxairspeed 250 sv_accelerate 5.5 sv_airaccelerate 5.5 sv_friction 5 -edgefriction 0 +edgefriction 1 sv_stepheight 34 -set g_balance_jumpheight 300 +set sv_jumpvelocity 300 set sv_friction_on_land 0 set sv_airaccel_sideways_friction 0 set sv_airaccel_qw 1 diff --git a/data/physicsQ3.cfg b/data/physicsQ3.cfg index f04dd5022..30699a057 100644 --- a/data/physicsQ3.cfg +++ b/data/physicsQ3.cfg @@ -4,9 +4,9 @@ sv_maxairspeed $sv_maxspeed sv_accelerate 10 sv_airaccelerate 1 sv_friction 6 -edgefriction 0 +edgefriction 1 sv_stepheight 18 -set g_balance_jumpheight 270 +set sv_jumpvelocity 270 set sv_friction_on_land 0 set sv_airaccel_sideways_friction 0 set sv_airaccel_qw 1 diff --git a/data/physicsQBF.cfg b/data/physicsQBF.cfg index 1294a3937..08867661f 100644 --- a/data/physicsQBF.cfg +++ b/data/physicsQBF.cfg @@ -3,9 +3,9 @@ sv_maxairspeed 250 sv_accelerate 5.5 sv_airaccelerate 5.5 sv_friction 5 -edgefriction 0 +edgefriction 1 sv_stepheight 34 -set g_balance_jumpheight 300 +set sv_jumpvelocity 300 set sv_friction_on_land 0 set sv_airaccel_sideways_friction 0.8 set sv_airaccel_qw 1 diff --git a/data/physicsQBFplus.cfg b/data/physicsQBFplus.cfg index 4b690af75..ec2984ada 100644 --- a/data/physicsQBFplus.cfg +++ b/data/physicsQBFplus.cfg @@ -3,9 +3,9 @@ sv_maxairspeed 220 sv_accelerate 5.5 sv_airaccelerate 5.5 sv_friction 5 -edgefriction 0 +edgefriction 1 sv_stepheight 34 -set g_balance_jumpheight 300 +set sv_jumpvelocity 300 set sv_friction_on_land 0 set sv_airaccel_sideways_friction 0.5 set sv_airaccel_qw 0.93 diff --git a/data/physicsQBR.cfg b/data/physicsQBR.cfg index 3465c4f6d..06847e77d 100644 --- a/data/physicsQBR.cfg +++ b/data/physicsQBR.cfg @@ -3,9 +3,9 @@ sv_maxairspeed 220 sv_accelerate 5.5 sv_airaccelerate 5.5 sv_friction 5 -edgefriction 0 +edgefriction 1 sv_stepheight 34 -set g_balance_jumpheight 300 +set sv_jumpvelocity 300 set sv_friction_on_land 0 set sv_airaccel_sideways_friction 0.3 set sv_airaccel_qw 0.93 diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 020859872..ca73c53c3 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -584,7 +584,7 @@ void FixClientCvars(entity e) stuffcmd(e, strcat("cl_movement_airaccelerate ", ftos(cvar("sv_airaccelerate")), "\n")); stuffcmd(e, strcat("cl_movement_maxairspeed ", ftos(cvar("sv_maxairspeed")), "\n")); stuffcmd(e, strcat("cl_movement_stopspeed ", ftos(cvar("sv_stopspeed")), "\n")); - stuffcmd(e, strcat("cl_movement_jumpvelocity ", ftos(cvar("g_balance_jumpheight")), "\n")); + stuffcmd(e, strcat("cl_movement_jumpvelocity ", ftos(cvar("sv_jumpvelocity")), "\n")); stuffcmd(e, strcat("cl_movement_stepheight ", ftos(cvar("sv_stepheight")), "\n")); stuffcmd(e, strcat("set cl_movement_friction_on_land ", ftos(cvar("sv_friction_on_land")), "\n")); stuffcmd(e, strcat("set cl_movement_airaccel_qw ", ftos(cvar("sv_airaccel_qw")), "\n")); diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc index 2bba8a96f..40cfc6bae 100644 --- a/data/qcsrc/server/cl_physics.qc +++ b/data/qcsrc/server/cl_physics.qc @@ -25,7 +25,7 @@ void PlayerJump (void) { float mjumpheight; - mjumpheight = cvar("g_balance_jumpheight"); + mjumpheight = cvar("sv_jumpvelocity"); if (self.waterlevel >= 2) { if (self.watertype == CONTENT_WATER) diff --git a/data/qcsrc/server/havocbot.qc b/data/qcsrc/server/havocbot.qc index 4ccca83f7..27f493d72 100644 --- a/data/qcsrc/server/havocbot.qc +++ b/data/qcsrc/server/havocbot.qc @@ -205,7 +205,7 @@ void() havocbot_movetogoal = self.movement_y = dir * v_right; if (self.flags & FL_INWATER) self.movement_z = dir * v_up; else self.movement_z = 0; - if ((dir * v_up) >= cvar("g_balance_jumpheight")*0.5 && (self.flags & FL_ONGROUND)) self.button2=1; + if ((dir * v_up) >= cvar("sv_jumpvelocity")*0.5 && (self.flags & FL_ONGROUND)) self.button2=1; if (((dodge * v_up) > 0) && random()*frametime >= 0.2*bound(0,(10-skill)*0.1,1)) self.button2=TRUE; if (((dodge * v_up) < 0) && random()*frametime >= 0.5*bound(0,(10-skill)*0.1,1)) self.havocbot_ducktime=time+0.3/bound(0.1,skill,10); -- 2.39.2