From 90a5b3918920a8235311e850fe239044acefe6c8 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Thu, 5 Apr 2012 00:34:41 +0300 Subject: [PATCH] Rename g_ode_items to g_physical_items --- defaultXonotic.cfg | 6 +++--- qcsrc/server/autocvars.qh | 6 +++--- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/mutators/mutator_physical_items.qc | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 1f74617f7..11a08eb43 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 g_ode_items 0 "1 uses ODE physics for dropped weapons, 2 for all items, requires physics_ode to be enabled" -set g_ode_items_damageforcescale 3 "how affected physical weapons are by damage" -set g_ode_items_reset 1 "return map items to their original lotation after being picked up" +set g_physical_items 0 "1 uses ODE physics for dropped weapons, 2 for all items, requires physics_ode to be enabled" +set g_physical_items_damageforcescale 3 "how affected physical weapons are by damage" +set g_physical_items_reset 1 "return map items to their original lotation after being picked up" // 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 8ec28c0f7..5d1b69183 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_g_ode_items; -float autocvar_g_ode_items_damageforcescale; -float autocvar_g_ode_items_reset; +float autocvar_g_physical_items; +float autocvar_g_physical_items_damageforcescale; +float autocvar_g_physical_items_reset; diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 71ae10b12..88b29fe27 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -1078,7 +1078,7 @@ void readlevelcvars(void) MUTATOR_ADD(mutator_vampire); if(cvar("g_spawn_near_teammate")) MUTATOR_ADD(mutator_spawn_near_teammate); - if(cvar("g_ode_items")) + if(cvar("g_physical_items")) MUTATOR_ADD(mutator_physical_items); // is this a mutator? is this a mode? diff --git a/qcsrc/server/mutators/mutator_physical_items.qc b/qcsrc/server/mutators/mutator_physical_items.qc index 60d5a0903..285dc4a7c 100644 --- a/qcsrc/server/mutators/mutator_physical_items.qc +++ b/qcsrc/server/mutators/mutator_physical_items.qc @@ -14,7 +14,7 @@ void physical_item_think() self.glowmod = self.owner.glowmod; // if the item is not spawned, make sure the invisible / ghost item returns to its origin and stays there - if(autocvar_g_ode_items_reset) + if(autocvar_g_physical_items_reset) { if(self.owner.nextthink > time) // awaiting respawn { @@ -57,7 +57,7 @@ void physical_item_damage(entity inflictor, entity attacker, float damage, float MUTATOR_HOOKFUNCTION(item_spawning) { - if(self.owner == world && autocvar_g_ode_items <= 1) + if(self.owner == world && autocvar_g_physical_items <= 1) return FALSE; if (self.spawnflags & 1) // floating item return FALSE; @@ -79,7 +79,7 @@ MUTATOR_HOOKFUNCTION(item_spawning) wep.effects |= EF_NOMODELFLAGS; // disable the spinning wep.colormap = self.owner.colormap; wep.glowmod = self.owner.glowmod; - wep.damageforcescale = autocvar_g_ode_items_damageforcescale; + wep.damageforcescale = autocvar_g_physical_items_damageforcescale; wep.dphitcontentsmask = self.dphitcontentsmask; wep.cnt = (self.owner != world); -- 2.39.2