commit message goes here

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index 15679e38fd7b99c08cf511ce1932dc30e58dd4c0..2f6b76df32b84d10b7541f36d27f33a843b548d1 100644 (file)
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -296,7 +296,7 @@ void ArcInit()
        arc_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), FALSE, FALSE, 2);
        arc_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), FALSE, FALSE, 3);
        arc_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), FALSE, FALSE, 4);
-       ARC_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+       ARC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
 }
 #endif
 #ifdef CSQC

diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc
index 7db42548f68705b0817290c9d4fd9ab01319338c..69ccbe5e76237108a50de42ce6c6aa6566485662 100644 (file)
--- a/qcsrc/common/weapons/w_blaster.qc
+++ b/qcsrc/common/weapons/w_blaster.qc
@@ -223,7 +223,7 @@ float W_Blaster(float request)
                        precache_model("models/weapons/v_laser.md3");
                        precache_model("models/weapons/h_laser.iqm");
                        precache_sound("weapons/lasergun_fire.wav");
-                       BLASTER_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       BLASTER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                

diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc
index 43436c18d8850c7ac7ad432c5af42325760bfea0..50b2208d675c0cb8ceeb8cd95982a609909b801c 100644 (file)
--- a/qcsrc/common/weapons/w_crylink.qc
+++ b/qcsrc/common/weapons/w_crylink.qc
@@ -640,7 +640,7 @@ float W_Crylink(float req)
                        precache_sound ("weapons/crylink_fire.wav");
                        precache_sound ("weapons/crylink_fire2.wav");
                        precache_sound ("weapons/crylink_linkjoin.wav");
-                       CRYLINK_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       CRYLINK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_CHECKAMMO1:

diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc
index ac2ec9cfed6ee72df9a7b8996be272955b1b8667..17d86fbe47191fa030abe4e348eb389ec2e7cc93 100644 (file)
--- a/qcsrc/common/weapons/w_devastator.qc
+++ b/qcsrc/common/weapons/w_devastator.qc
@@ -400,7 +400,7 @@ float W_Devastator(float req)
                                precache_sound("weapons/rocket_fire.wav");
                                precache_sound("weapons/rocket_mode.wav");
                        }
-                       DEVASTATOR_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       DEVASTATOR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_SETUP:

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index f4e7d5335b3c2333939cd24d51d42dea0f664d45..d119dd0e8d54962c2d02dec7b381c3ce1690676b 100644 (file)
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -484,7 +484,7 @@ float W_Electro(float req)
                        precache_sound("weapons/electro_fire2.wav");
                        precache_sound("weapons/electro_impact.wav");
                        precache_sound("weapons/electro_impact_combo.wav");
-                       ELECTRO_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       ELECTRO_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_CHECKAMMO1:

diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc
index e1cbefad208e0bc2c16d72d019e838d9350eb525..28c7e46e646257984e3234e5cf0e2453936c268e 100644 (file)
--- a/qcsrc/common/weapons/w_fireball.qc
+++ b/qcsrc/common/weapons/w_fireball.qc
@@ -402,7 +402,7 @@ float W_Fireball(float req)
                        precache_sound ("weapons/fireball_fire.wav");
                        precache_sound ("weapons/fireball_fire2.wav");
                        precache_sound ("weapons/fireball_prefire2.wav");
-                       FIREBALL_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       FIREBALL_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_SETUP:

diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc
index 8aea670d89f8d50ff811756dd1bc2809e0b92617..e779cf3c7a42d3a473f73592d42507360cdadc60 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -448,7 +448,7 @@ float W_Hagar(float req)
                        precache_sound ("weapons/hagar_fire.wav");
                        precache_sound ("weapons/hagar_load.wav");
                        precache_sound ("weapons/hagar_beep.wav");
-                       HAGAR_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       HAGAR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_SETUP:

diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc
index c60a48b4d8ee5123b3e89ae6a247cf0b46860c59..450a066e6efa6ddf1d820565ccd40611ddcbfaaf 100644 (file)
--- a/qcsrc/common/weapons/w_hlac.qc
+++ b/qcsrc/common/weapons/w_hlac.qc
@@ -241,7 +241,7 @@ float W_HLAC(float req)
                        precache_model ("models/weapons/v_hlac.md3");
                        precache_model ("models/weapons/h_hlac.iqm");
                        precache_sound ("weapons/lasergun_fire.wav");
-                       HLAC_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       HLAC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_CHECKAMMO1:

diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc
index 0ea8f680b78432e52f8cb76eb85438af5c3a32a8..82b3b77b40f467041eed8a57f940e2d05abaa6f5 100644 (file)
--- a/qcsrc/common/weapons/w_hook.qc
+++ b/qcsrc/common/weapons/w_hook.qc
@@ -290,7 +290,7 @@ float W_Hook(float req)
                        precache_sound ("weapons/hook_impact.wav"); // done by g_hook.qc
                        precache_sound ("weapons/hook_fire.wav");
                        precache_sound ("weapons/hookbomb_fire.wav");
-                       HOOK_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       HOOK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_SETUP:

diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc
index f242a8b9d70f01c4c147170466b953ed1968b140..04aad11b1aa6700982e4bd2cd1bda33823c5cc9a 100644 (file)
--- a/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@ -305,7 +305,7 @@ float W_MachineGun(float req)
                        precache_model ("models/weapons/v_uzi.md3");
                        precache_model ("models/weapons/h_uzi.iqm");
                        precache_sound ("weapons/uzi_fire.wav");
-                       MACHINEGUN_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       MACHINEGUN_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_CHECKAMMO1:

diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc
index 0e5b0f20e70637d2c276304b04364188e0063456..c3cf69573015cfae54735961f290672dc41a9f6a 100644 (file)
--- a/qcsrc/common/weapons/w_minelayer.qc
+++ b/qcsrc/common/weapons/w_minelayer.qc
@@ -537,7 +537,7 @@ float W_MineLayer(float req)
                        precache_sound ("weapons/mine_fire.wav");
                        precache_sound ("weapons/mine_stick.wav");
                        precache_sound ("weapons/mine_trigger.wav");
-                       MINELAYER_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       MINELAYER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_CHECKAMMO1:

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index 1e2032823830d6696166bd2c74e12b2c40297de5..353dc3218443808673a55c52bff5ef54567c684c 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -412,7 +412,7 @@ float W_Mortar(float req)
                        precache_sound ("weapons/grenade_bounce6.wav");
                        precache_sound ("weapons/grenade_stick.wav");
                        precache_sound ("weapons/grenade_fire.wav");
-                       MORTAR_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       MORTAR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_CHECKAMMO1:

diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc
index e68f37c3aa052ad0d0a78d650cc1e0f0d172570f..b1c0124dbf4ed9e83fe04376882d124172914b83 100644 (file)
--- a/qcsrc/common/weapons/w_porto.qc
+++ b/qcsrc/common/weapons/w_porto.qc
@@ -375,7 +375,7 @@ float W_Porto(float req)
                        precache_sound ("porto/explode.wav");
                        precache_sound ("porto/fire.wav");
                        precache_sound ("porto/unsupported.wav");
-                       PORTO_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       PORTO_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_SETUP:

diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc
index b3feb2cc7e531fed7c2c255e03305e04a67d2bb2..af90b2b98ca5492e356fe586b5068040f13794fc 100644 (file)
--- a/qcsrc/common/weapons/w_rifle.qc
+++ b/qcsrc/common/weapons/w_rifle.qc
@@ -205,7 +205,7 @@ float W_Rifle(float req)
                        precache_model ("models/weapons/h_campingrifle.iqm");
                        precache_sound ("weapons/campingrifle_fire.wav");
                        precache_sound ("weapons/campingrifle_fire2.wav");
-                       RIFLE_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       RIFLE_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_CHECKAMMO1:

diff --git a/qcsrc/common/weapons/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc
index aabac65a9250b4b01daa6464ce5425ca7db751b7..b7a57e86924db94e12f24a45d045214538365f86 100644 (file)
--- a/qcsrc/common/weapons/w_seeker.qc
+++ b/qcsrc/common/weapons/w_seeker.qc
@@ -665,7 +665,7 @@ float W_Seeker(float req)
                        precache_sound ("weapons/tag_fire.wav");
                        precache_sound ("weapons/flac_fire.wav");
                        precache_sound ("weapons/seeker_fire.wav");
-                       SEEKER_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       SEEKER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_CHECKAMMO1:

diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc
index 752e43b335808a38b16093efa776d2f73ae9a736..781fb4e6f020397fc6f81da9ebd8827fd1464cd0 100644 (file)
--- a/qcsrc/common/weapons/w_shockwave.qc
+++ b/qcsrc/common/weapons/w_shockwave.qc
@@ -679,7 +679,7 @@ float W_Shockwave(float req)
                        precache_sound("misc/itempickup.wav");
                        precache_sound("weapons/shockwave_fire.wav");
                        precache_sound("weapons/shockwave_melee.wav");
-                       SHOCKWAVE_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       SHOCKWAVE_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_CHECKAMMO1:

diff --git a/qcsrc/common/weapons/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc
index 5db2380aaf83248bd7fd6447af5935bbca214462..c081c931881894b3f8c4b15ee305665159863c50 100644 (file)
--- a/qcsrc/common/weapons/w_shotgun.qc
+++ b/qcsrc/common/weapons/w_shotgun.qc
@@ -245,7 +245,7 @@ float W_Shotgun(float req)
                        precache_sound ("misc/itempickup.wav");
                        precache_sound ("weapons/shotgun_fire.wav");
                        precache_sound ("weapons/shotgun_melee.wav");
-                       SHOTGUN_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       SHOTGUN_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_SETUP:

diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc
index eb7dfa774195d0646e564e3db4b3e7ba61ff421d..9d3f7dbe1b24515010ae89b8f457e481f96eeaef 100644 (file)
--- a/qcsrc/common/weapons/w_tuba.qc
+++ b/qcsrc/common/weapons/w_tuba.qc
@@ -415,7 +415,7 @@ float W_Tuba(float req)
                        precache_model ("models/weapons/h_akordeon.iqm");
                        precache_model ("models/weapons/v_kleinbottle.md3");
                        precache_model ("models/weapons/h_kleinbottle.iqm");
-                       TUBA_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       TUBA_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_SETUP:

diff --git a/qcsrc/common/weapons/w_vaporizer.qc b/qcsrc/common/weapons/w_vaporizer.qc
index ce9bc6b1027479ce39e2ce446cb3d8810eea1283..e1e282314491cdb6e1e2bbd0e977365df7220cd7 100644 (file)
--- a/qcsrc/common/weapons/w_vaporizer.qc
+++ b/qcsrc/common/weapons/w_vaporizer.qc
@@ -192,7 +192,7 @@ float W_Vaporizer(float req)
                        precache_sound("weapons/nexwhoosh2.wav");
                        precache_sound("weapons/nexwhoosh3.wav");
                        //W_Blaster(WR_INIT); // Samual: Is this really the proper thing to do? Didn't we already run this previously?
-                       VAPORIZER_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       VAPORIZER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_SETUP:

diff --git a/qcsrc/common/weapons/w_vortex.qc b/qcsrc/common/weapons/w_vortex.qc
index 9935f855f83a10d27159d5f1f730c57cd753ec6c..19eba5ae46a3e4a47dd4863bf97b5571eb50402b 100644 (file)
--- a/qcsrc/common/weapons/w_vortex.qc
+++ b/qcsrc/common/weapons/w_vortex.qc
@@ -248,7 +248,7 @@ float W_Vortex(float req)
                        precache_sound ("weapons/nexwhoosh1.wav");
                        precache_sound ("weapons/nexwhoosh2.wav");
                        precache_sound ("weapons/nexwhoosh3.wav");
-                       VORTEX_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       VORTEX_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_CHECKAMMO1:

diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index ad7b351f7d5a24ddf56014bee04a139b859e46e1..70e476658ac3f6f2ff9b064c74b48619e5aa5c5e 100644 (file)
--- a/qcsrc/common/weapons/weapons.qh
+++ b/qcsrc/common/weapons/weapons.qh
@@ -119,7 +119,7 @@ float GetAmmoStat(.float ammotype);
 #define WEP_CVAR_BOTH(wepname,isprimary,name) ((isprimary) ? WEP_CVAR_PRI(wepname, name) : WEP_CVAR_SEC(wepname, name))
 
 // set initialization values for weapon settings
-#define WEP_SKIPCVAR(unuseda,unusedb,unusedc,unusedd) /* skip cvars */
+#define WEP_SKIP_CVAR(unuseda,unusedb,unusedc,unusedd) /* skip cvars */
 #define WEP_SET_PROP(wepid,wepname,type,prop,name) get_weaponinfo(WEP_##wepid).##prop = autocvar_g_balance_##wepname##_##name;