From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 3 Apr 2012 20:57:39 +0000 (+0300)
Subject: Correct cvar names
X-Git-Tag: xonotic-v0.7.0~111^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=37ee8383a37d13c69b1714a3434cad97613229dc;p=xonotic%2Fxonotic-data.pk3dir.git

Correct cvar names
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b697b18fe2..0f1e4184f1 100644
--- 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 527f39822a..399bb2f1fb 100644
--- 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 53f39525f7..9e2468db0a 100644
--- 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;