Correct cvar names

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b697b18fe2023c67de38c3d4f9ce3f464a18acde..0f1e4184f124e95d09ebe2a2affbf2c90c9543cc 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1387,9 +1387,9 @@ alias sethostname "set menu_use_default_hostname 0; hostname $*"
 
 set sv_foginterval 1 "force enable fog in regular intervals"
 
-set sv_physics_ode_droppedweapon 1 "use ODE physics instead of simple physics for dropped weapons, requires physics_ode to be enabled"
-set sv_physics_ode_droppedweapon_damageforcescale 3 "how affected physical weapons are by damage"
-set sv_physics_ode_droppedweapon_avelocity 2 "randomized anagular velocity given to the weapon when dropping"
+set physics_ode_droppedweapon 1 "use ODE physics instead of simple physics for dropped weapons, requires physics_ode to be enabled"
+set physics_ode_droppedweapon_damageforcescale 3 "how affected physical weapons are by damage"
+set physics_ode_droppedweapon_avelocity 2 "randomized anagular velocity given to the weapon when dropping"
 
 // Audio track names (for old-style "cd loop NUMBER" usage)
 set _cdtrack_first "1"

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 527f39822a14925fab8c348ef341c09506c0eb0d..399bb2f1fb94fced4f6b5622d57a1fa0a8eb5328 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1216,6 +1216,6 @@ float autocvar_g_sandbox_object_material_velocity_min;
 float autocvar_g_sandbox_object_material_velocity_factor;
 float autocvar_g_max_info_autoscreenshot;
 float autocvar_physics_ode;
-float autocvar_sv_physics_ode_droppedweapon;
-float autocvar_sv_physics_ode_droppedweapon_damageforcescale;
-float autocvar_sv_physics_ode_droppedweapon_avelocity;
+float autocvar_physics_ode_droppedweapon;
+float autocvar_physics_ode_droppedweapon_damageforcescale;
+float autocvar_physics_ode_droppedweapon_avelocity;

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 53f39525f77e8d25b23b834052e92de1762e24b2..9e2468db0a486ba56ec76aaacda6c0f0f5ab14ec 100644 (file)
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -312,7 +312,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
                wep.pickup_anyway = TRUE; // these are ALWAYS pickable
 
                // make the dropped weapon physical
-               if(autocvar_physics_ode && autocvar_sv_physics_ode_droppedweapon)
+               if(autocvar_physics_ode && autocvar_physics_ode_droppedweapon)
                {
                        entity wep2;
                        wep2 = spawn();
@@ -320,9 +320,9 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
                        setmodel(wep2, wep.model);
                        wep2.angles = wep.angles;
                        wep2.velocity = velo;
-                       wep2.avelocity_x = random() * autocvar_sv_physics_ode_droppedweapon_avelocity;
-                       wep2.avelocity_y = random() * autocvar_sv_physics_ode_droppedweapon_avelocity;
-                       wep2.avelocity_z = random() * autocvar_sv_physics_ode_droppedweapon_avelocity;
+                       wep2.avelocity_x = random() * autocvar_physics_ode_droppedweapon_avelocity;
+                       wep2.avelocity_y = random() * autocvar_physics_ode_droppedweapon_avelocity;
+                       wep2.avelocity_z = random() * autocvar_physics_ode_droppedweapon_avelocity;
 
                        wep2.classname = "droppedweapon2";
                        wep2.owner = wep;
@@ -331,7 +331,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
                        wep2.takedamage = DAMAGE_AIM;
                        wep2.colormap = wep.colormap;
                        wep2.glowmod = wep.glowmod;
-                       wep2.damageforcescale = autocvar_sv_physics_ode_droppedweapon_damageforcescale;
+                       wep2.damageforcescale = autocvar_physics_ode_droppedweapon_damageforcescale;
 
                        wep2.think = thrown_wep_ode_think;
                        wep2.nextthink = time;