Fix a few cases of var float

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index e6b2173163bc762d7d04e7c03d4db41d22f1c376..b6afea58fd650649bb76f8db564ac76892dded36 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -5215,12 +5215,12 @@ float QuickMenu_CurrentPage;
 float QuickMenu_IsLastPage;
 // each quickmenu entry (submenu or command) is composed of 2 entries in the buffer
 #define QUICKMENU_BUFFER_MAXENTRIES 2*QUICKMENU_MAXENTRIES
-var float QuickMenu_Buffer = -1;
+float QuickMenu_Buffer = -1;
 float QuickMenu_Buffer_Size;
 float QuickMenu_Buffer_Index;
 string QuickMenu_CurrentSubMenu;
 float QuickMenu_CurrentPage_FirstEntry;
-var float QuickMenu_Entries;
+float QuickMenu_Entries;
 float QuickMenu_TimeOut;
 void HUD_QuickMenu_load_entry(float i, string s, string s1)
 {

diff --git a/qcsrc/common/monsters/monster/afrit.qc b/qcsrc/common/monsters/monster/afrit.qc
index 0db2af618f4578058b5b41b4f63a074474de2278..3a5458d3f422d182e9efe8f0771bca0d57ec3c45 100644 (file)
--- a/qcsrc/common/monsters/monster/afrit.qc
+++ b/qcsrc/common/monsters/monster/afrit.qc
@@ -14,7 +14,7 @@ REGISTER_MONSTER(
 #include "../../server/mutators/base.qh"
 
 float autocvar_g_monster_afrit_health;
-var float autocvar_g_monster_afrit_damageforcescale = 0.3;
+float autocvar_g_monster_afrit_damageforcescale = 0.3;
 float autocvar_g_monster_afrit_attack_fireball_damage;
 float autocvar_g_monster_afrit_attack_fireball_edgedamage;
 float autocvar_g_monster_afrit_attack_fireball_damagetime;

diff --git a/qcsrc/common/monsters/monster/creeper.qc b/qcsrc/common/monsters/monster/creeper.qc
index 93228efe329e5b69246b848b99b4aeea97a0215f..21f4f5ad1834538e3e1a86ce2c11f7f38db0ae1d 100644 (file)
--- a/qcsrc/common/monsters/monster/creeper.qc
+++ b/qcsrc/common/monsters/monster/creeper.qc
@@ -12,7 +12,7 @@ REGISTER_MONSTER(
 #else
 #ifdef SVQC
 float autocvar_g_monster_creeper_health;
-var float autocvar_g_monster_creeper_damageforcescale = 0.0001; // hehehe
+float autocvar_g_monster_creeper_damageforcescale = 0.0001; // hehehe
 float autocvar_g_monster_creeper_attack_explode_damage;
 float autocvar_g_monster_creeper_attack_explode_edgedamage;
 float autocvar_g_monster_creeper_attack_explode_radius;

diff --git a/qcsrc/common/monsters/monster/demon.qc b/qcsrc/common/monsters/monster/demon.qc
index d403aa3e3bdd68d29442cef422700481beae0a15..718246f8bf63a5360ff60d8c2069865279d29523 100644 (file)
--- a/qcsrc/common/monsters/monster/demon.qc
+++ b/qcsrc/common/monsters/monster/demon.qc
@@ -12,7 +12,7 @@ REGISTER_MONSTER(
 #else
 #ifdef SVQC
 float autocvar_g_monster_demon_health;
-var float autocvar_g_monster_demon_damageforcescale = 0.35;
+float autocvar_g_monster_demon_damageforcescale = 0.35;
 float autocvar_g_monster_demon_attack_melee_damage;
 float autocvar_g_monster_demon_attack_melee_delay;
 float autocvar_g_monster_demon_attack_leap_damage;

diff --git a/qcsrc/common/monsters/monster/enforcer.qc b/qcsrc/common/monsters/monster/enforcer.qc
index 013de5242e6da0a746daacbe359a82450b0941ea..a48a0af15ff58b67eecc659667642a373dd386c0 100644 (file)
--- a/qcsrc/common/monsters/monster/enforcer.qc
+++ b/qcsrc/common/monsters/monster/enforcer.qc
@@ -12,7 +12,7 @@ REGISTER_MONSTER(
 #else
 #ifdef SVQC
 float autocvar_g_monster_enforcer_health;
-var float autocvar_g_monster_enforcer_damageforcescale = 0.7;
+float autocvar_g_monster_enforcer_damageforcescale = 0.7;
 float autocvar_g_monster_enforcer_attack_plasma_damage;
 float autocvar_g_monster_enforcer_attack_plasma_edgedamage;
 float autocvar_g_monster_enforcer_attack_plasma_force;

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index c4c5bad61cfd3b48fc4296cd480f1444f96c9961..9535701ff78dd9500c0946aca278a58d42e819d1 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -14,7 +14,7 @@ REGISTER_MONSTER(
 #include "../../effects.qh"
 
 float autocvar_g_monster_mage_health;
-var float autocvar_g_monster_mage_damageforcescale = 0.5;
+float autocvar_g_monster_mage_damageforcescale = 0.5;
 float autocvar_g_monster_mage_attack_spike_damage;
 float autocvar_g_monster_mage_attack_spike_radius;
 float autocvar_g_monster_mage_attack_spike_delay;

diff --git a/qcsrc/common/monsters/monster/ogre.qc b/qcsrc/common/monsters/monster/ogre.qc
index 1521d893ecbe92a112ab1a00acc63669fc0a786a..ceb4d73fd9e0a862bb5ff9cfa7133b45363198aa 100644 (file)
--- a/qcsrc/common/monsters/monster/ogre.qc
+++ b/qcsrc/common/monsters/monster/ogre.qc
@@ -14,7 +14,7 @@ REGISTER_MONSTER(
 #include "../../effects.qh"
 
 float autocvar_g_monster_ogre_health;
-var float autocvar_g_monster_ogre_damageforcescale = 0.4;
+float autocvar_g_monster_ogre_damageforcescale = 0.4;
 float autocvar_g_monster_ogre_attack_machinegun_spread;
 float autocvar_g_monster_ogre_attack_machinegun_solidpenetration;
 float autocvar_g_monster_ogre_attack_machinegun_damage;

diff --git a/qcsrc/common/monsters/monster/rotfish.qc b/qcsrc/common/monsters/monster/rotfish.qc
index a4b84794803d7b3bb5045d46c0ffadf7272b6699..91351e589917cfda4843edb7679e80ab54574ddd 100644 (file)
--- a/qcsrc/common/monsters/monster/rotfish.qc
+++ b/qcsrc/common/monsters/monster/rotfish.qc
@@ -12,7 +12,7 @@ REGISTER_MONSTER(
 #else
 #ifdef SVQC
 float autocvar_g_monster_rotfish_health;
-var float autocvar_g_monster_rotfish_damageforcescale = 0.8;
+float autocvar_g_monster_rotfish_damageforcescale = 0.8;
 float autocvar_g_monster_rotfish_attack_range;
 float autocvar_g_monster_rotfish_attack_melee_damage;
 float autocvar_g_monster_rotfish_attack_melee_delay;

diff --git a/qcsrc/common/monsters/monster/rottweiler.qc b/qcsrc/common/monsters/monster/rottweiler.qc
index cda2a6c47393d67faf41b94048b61df78282fbf5..c38cb06100706ceb130647aee7509d1632da74e5 100644 (file)
--- a/qcsrc/common/monsters/monster/rottweiler.qc
+++ b/qcsrc/common/monsters/monster/rottweiler.qc
@@ -12,7 +12,7 @@ REGISTER_MONSTER(
 #else
 #ifdef SVQC
 float autocvar_g_monster_rottweiler_health;
-var float autocvar_g_monster_rottweiler_damageforcescale = 0.7;
+float autocvar_g_monster_rottweiler_damageforcescale = 0.7;
 float autocvar_g_monster_rottweiler_attack_melee_damage;
 float autocvar_g_monster_rottweiler_attack_melee_delay;
 float autocvar_g_monster_rottweiler_speed_stop;

diff --git a/qcsrc/common/monsters/monster/scrag.qc b/qcsrc/common/monsters/monster/scrag.qc
index ffb5879ab2aa20f23d6b297400a3b4ff53af0798..7a722097128d845372054b431232e9dd3a2a5896 100644 (file)
--- a/qcsrc/common/monsters/monster/scrag.qc
+++ b/qcsrc/common/monsters/monster/scrag.qc
@@ -12,7 +12,7 @@ REGISTER_MONSTER(
 #else
 #ifdef SVQC
 float autocvar_g_monster_scrag_health;
-var float autocvar_g_monster_scrag_damageforcescale = 0.55;
+float autocvar_g_monster_scrag_damageforcescale = 0.55;
 float autocvar_g_monster_scrag_attack_spike_damage;
 float autocvar_g_monster_scrag_attack_spike_edgedamage;
 float autocvar_g_monster_scrag_attack_spike_force;

diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc
index c14f1754ff86e2a872fb582a7c7b5ae1ab0f2b72..c614a7801a8ccab543aa373ffe17ba10adbcd2fc 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qc
+++ b/qcsrc/common/monsters/monster/shambler.qc
@@ -14,7 +14,7 @@ REGISTER_MONSTER(
 #include "../../effects.qh"
 
 float autocvar_g_monster_shambler_health;
-var float autocvar_g_monster_shambler_damageforcescale = 0.1;
+float autocvar_g_monster_shambler_damageforcescale = 0.1;
 float autocvar_g_monster_shambler_attack_smash_damage;
 float autocvar_g_monster_shambler_attack_smash_range;
 float autocvar_g_monster_shambler_attack_claw_damage;

diff --git a/qcsrc/common/monsters/monster/spawn.qc b/qcsrc/common/monsters/monster/spawn.qc
index fa6a8915f14a2cfabc991c26552426877dd946e4..6e6339eb859dbe0dffd0d4de81e362c408d34fd0 100644 (file)
--- a/qcsrc/common/monsters/monster/spawn.qc
+++ b/qcsrc/common/monsters/monster/spawn.qc
@@ -14,7 +14,7 @@ REGISTER_MONSTER(
 #include "../../effects.qh"
 
 float autocvar_g_monster_spawn_health;
-var float autocvar_g_monster_spawn_damageforcescale = 0.6;
+float autocvar_g_monster_spawn_damageforcescale = 0.6;
 float autocvar_g_monster_spawn_attack_explode_damage;
 float autocvar_g_monster_spawn_attack_explode_edgedamage;
 float autocvar_g_monster_spawn_attack_explode_radius;

diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc
index 59f9e08b1e2148085074b389df21ebadc9740c4c..7e75fd541ce5234f73644c1ec402c59598e31800 100644 (file)
--- a/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@ -14,7 +14,7 @@ REGISTER_MONSTER(
 #include "../../effects.qh"
 
 float autocvar_g_monster_spider_health;
-var float autocvar_g_monster_spider_damageforcescale = 0.6;
+float autocvar_g_monster_spider_damageforcescale = 0.6;
 float autocvar_g_monster_spider_attack_bite_damage;
 float autocvar_g_monster_spider_attack_bite_delay;
 float autocvar_g_monster_spider_attack_web_damagetime;

diff --git a/qcsrc/common/monsters/monster/vore.qc b/qcsrc/common/monsters/monster/vore.qc
index b0e9ba4a395ac224e1189dad0c6a45466c7166f3..ebd5c56c347262e47b634d8aacf261abf56e07dc 100644 (file)
--- a/qcsrc/common/monsters/monster/vore.qc
+++ b/qcsrc/common/monsters/monster/vore.qc
@@ -14,7 +14,7 @@ REGISTER_MONSTER(
 #include "../../effects.qh"
 
 float autocvar_g_monster_vore_health;
-var float autocvar_g_monster_vore_damageforcescale = 0.4;
+float autocvar_g_monster_vore_damageforcescale = 0.4;
 float autocvar_g_monster_vore_attack_spike_damage;
 float autocvar_g_monster_vore_attack_spike_radius;
 float autocvar_g_monster_vore_attack_spike_delay;

diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc
index 2acc1c06e728d054c1d13372f69931a850d8a352..cef6ed66eb7c9e27f8b7f3a64b0c36999152c387 100644 (file)
--- a/qcsrc/common/monsters/monster/wyvern.qc
+++ b/qcsrc/common/monsters/monster/wyvern.qc
@@ -14,7 +14,7 @@ REGISTER_MONSTER(
 #include "../../effects.qh"
 
 float autocvar_g_monster_wyvern_health;
-var float autocvar_g_monster_wyvern_damageforcescale = 0.6;
+float autocvar_g_monster_wyvern_damageforcescale = 0.6;
 float autocvar_g_monster_wyvern_attack_fireball_damage;
 float autocvar_g_monster_wyvern_attack_fireball_edgedamage;
 float autocvar_g_monster_wyvern_attack_fireball_damagetime;

diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc
index ec798681af0b5947272e90decb6b470a71a42394..e754ef408a9b3750a34e1facc60debae5461db91 100644 (file)
--- a/qcsrc/common/monsters/monster/zombie.qc
+++ b/qcsrc/common/monsters/monster/zombie.qc
@@ -12,7 +12,7 @@ REGISTER_MONSTER(
 #else
 #ifdef SVQC
 float autocvar_g_monster_zombie_health;
-var float autocvar_g_monster_zombie_damageforcescale = 0.55;
+float autocvar_g_monster_zombie_damageforcescale = 0.55;
 float autocvar_g_monster_zombie_attack_melee_damage;
 float autocvar_g_monster_zombie_attack_melee_delay;
 float autocvar_g_monster_zombie_attack_leap_damage;

diff --git a/qcsrc/common/movetypes/walk.qc b/qcsrc/common/movetypes/walk.qc
index cbcfc5b39233f37dd2683ec1034ae3f099852235..180dfcc7fb5a2b793d95d9a643298cf9e26bd895 100644 (file)
--- a/qcsrc/common/movetypes/walk.qc
+++ b/qcsrc/common/movetypes/walk.qc
@@ -29,11 +29,13 @@ void _Movetype_Physics_Walk(float dt)  // SV_WalkMove
                vector upmove = self.move_origin + '0 0 1';
                vector downmove = self.move_origin - '0 0 1';
                int type;
-               if (self.move_movetype == MOVETYPE_FLYMISSILE) type = MOVE_MISSILE; else if (self.move_movetype == MOVETYPE_FLY_WORLDONLY)
+               if (self.move_movetype == MOVETYPE_FLYMISSILE)
+                       type = MOVE_MISSILE;
+               else if (self.move_movetype == MOVETYPE_FLY_WORLDONLY)
                        type = MOVE_WORLDONLY;
                else if (self.solid == SOLID_TRIGGER || self.solid == SOLID_NOT)
                        type = MOVE_NOMONSTERS;
-               else   type = MOVE_NORMAL;
+               else type = MOVE_NORMAL;
                tracebox(upmove, self.mins, self.maxs, downmove, type, self);
                if (trace_fraction < 1 && trace_plane_normal.z > 0.7)
                        clip |= 1;  // but we HAVE found a floor