From: Mario Date: Fri, 24 Apr 2015 07:15:53 +0000 (+1000) Subject: Fix a few cases of var float X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f8036f58c3c64ebe170ef8258d85520ad43c9c32;p=xonotic%2Fxonotic-data.pk3dir.git Fix a few cases of var float --- diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index e6b217316..b6afea58f 100644 --- 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 0db2af618..3a5458d3f 100644 --- 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 93228efe3..21f4f5ad1 100644 --- 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 d403aa3e3..718246f8b 100644 --- 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 013de5242..a48a0af15 100644 --- 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 c4c5bad61..9535701ff 100644 --- 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 1521d893e..ceb4d73fd 100644 --- 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 a4b847948..91351e589 100644 --- 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 cda2a6c47..c38cb0610 100644 --- 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 ffb5879ab..7a7220971 100644 --- 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 c14f1754f..c614a7801 100644 --- 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 fa6a8915f..6e6339eb8 100644 --- 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 59f9e08b1..7e75fd541 100644 --- 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 b0e9ba4a3..ebd5c56c3 100644 --- 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 2acc1c06e..cef6ed66e 100644 --- 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 ec798681a..e754ef408 100644 --- 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 cbcfc5b39..180dfcc7f 100644 --- 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