Rename WEP_GRENADE_LAUNCHER to WEP_MORTAR

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index d18eba00624e3360a28bc2bfdba6377a1abb31a2..fbbba4f62a1a9165d2a0b5d06b737baaecadd338 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -274,7 +274,7 @@ float TrueAimCheck()
                case WEP_TUBA: // no aim
                case WEP_PORTO: // shoots from eye
                case WEP_HOOK: // no trueaim
-               case WEP_GRENADE_LAUNCHER: // toss curve
+               case WEP_MORTAR: // toss curve
                        return SHOTTYPE_HITWORLD;
                case WEP_NEX:
                case WEP_MINSTANEX:

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 88157fafeddf03bce4510826395fbb76ea4230fe..24c9658abe157307759100f1313836ef9e851399 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -427,7 +427,7 @@ float GetAmmoTypeForWep(float i) // WEAPONTODO
        {
                case WEP_SHOCKWAVE: return 0;
                case WEP_UZI: return 1;
-               case WEP_GRENADE_LAUNCHER: return 2;
+               case WEP_MORTAR: return 2;
                case WEP_MINE_LAYER: return 2;
                case WEP_ELECTRO: return 3;
                case WEP_CRYLINK: return 3;

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index 54177812fb11886304d402b327d68f4a6c302a79..76e2fe820646bf9d931aae00e2d1d174a433a0e9 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -12,28 +12,28 @@ REGISTER_WEAPON(
 );
 
 #define MORTAR_SETTINGS(w_cvar,w_prop) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, ammo) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, animtime) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_NONE, bouncefactor) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_NONE, bouncestop) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, damage) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, damageforcescale) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, edgedamage) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, force) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, health) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, lifetime) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_SEC,  lifetime_bounce) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, lifetime_stick) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, radius) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, refire) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_PRI,  remote_minbouncecnt) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, speed) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, speed_up) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, type) \
-       w_prop(WEP_GRENADE_LAUNCHER, mortar, reloading_ammo, reload_ammo) \
-       w_prop(WEP_GRENADE_LAUNCHER, mortar, reloading_time, reload_time) \
-       w_prop(WEP_GRENADE_LAUNCHER, mortar, switchdelay_raise, switchdelay_raise) \
-       w_prop(WEP_GRENADE_LAUNCHER, mortar, switchdelay_drop, switchdelay_drop)
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, ammo) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, animtime) \
+       w_cvar(WEP_MORTAR, mortar, MO_NONE, bouncefactor) \
+       w_cvar(WEP_MORTAR, mortar, MO_NONE, bouncestop) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, damage) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, damageforcescale) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, edgedamage) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, force) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, health) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, lifetime) \
+       w_cvar(WEP_MORTAR, mortar, MO_SEC,  lifetime_bounce) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, lifetime_stick) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, radius) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, refire) \
+       w_cvar(WEP_MORTAR, mortar, MO_PRI,  remote_minbouncecnt) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, speed) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, speed_up) \
+       w_cvar(WEP_MORTAR, mortar, MO_BOTH, type) \
+       w_prop(WEP_MORTAR, mortar, reloading_ammo, reload_ammo) \
+       w_prop(WEP_MORTAR, mortar, reloading_time, reload_time) \
+       w_prop(WEP_MORTAR, mortar, switchdelay_raise, switchdelay_raise) \
+       w_prop(WEP_MORTAR, mortar, switchdelay_drop, switchdelay_drop)
 
 #ifdef SVQC
 MORTAR_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
@@ -223,7 +223,7 @@ void W_Grenade_Attack (void)
        gren.bouncefactor = WEP_CVAR(mortar, bouncefactor);
        gren.bouncestop = WEP_CVAR(mortar, bouncestop);
        PROJECTILE_MAKETRIGGER(gren);
-       gren.projectiledeathtype = WEP_GRENADE_LAUNCHER;
+       gren.projectiledeathtype = WEP_MORTAR;
        setorigin(gren, w_shotorg);
        setsize(gren, '-3 -3 -3', '3 3 3');
 
@@ -272,7 +272,7 @@ void W_Grenade_Attack2 (void)
        gren.bouncefactor = WEP_CVAR(mortar, bouncefactor);
        gren.bouncestop = WEP_CVAR(mortar, bouncestop);
        PROJECTILE_MAKETRIGGER(gren);
-       gren.projectiledeathtype = WEP_GRENADE_LAUNCHER | HITTYPE_SECONDARY;
+       gren.projectiledeathtype = WEP_MORTAR | HITTYPE_SECONDARY;
        setorigin(gren, w_shotorg);
        setsize(gren, '-3 -3 -3', '3 3 3');
 
@@ -302,7 +302,7 @@ void W_Grenade_Attack2 (void)
 
 void spawnfunc_weapon_grenadelauncher (void)
 {
-       weapon_defaultspawnfunc(WEP_GRENADE_LAUNCHER);
+       weapon_defaultspawnfunc(WEP_MORTAR);
 }
 
 .float bot_secondary_grenademooth;
@@ -413,13 +413,13 @@ float w_glauncher(float req)
                case WR_CHECKAMMO1:
                {
                        ammo_amount = self.ammo_rockets >= WEP_CVAR_PRI(mortar, ammo);
-                       ammo_amount += self.(weapon_load[WEP_GRENADE_LAUNCHER]) >= WEP_CVAR_PRI(mortar, ammo);
+                       ammo_amount += self.(weapon_load[WEP_MORTAR]) >= WEP_CVAR_PRI(mortar, ammo);
                        return ammo_amount;
                }
                case WR_CHECKAMMO2:
                {
                        ammo_amount = self.ammo_rockets >= WEP_CVAR_SEC(mortar, ammo);
-                       ammo_amount += self.(weapon_load[WEP_GRENADE_LAUNCHER]) >= WEP_CVAR_SEC(mortar, ammo);
+                       ammo_amount += self.(weapon_load[WEP_MORTAR]) >= WEP_CVAR_SEC(mortar, ammo);
                        return ammo_amount;
                }
                case WR_CONFIG:

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index 84516ded0fa506f31dc8be3bbda67389d71d69d9..19e25a4d82c9046f16e57499fff62edf222c8e26 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -148,7 +148,7 @@ float W_IsWeaponThrowable(float w)
                return 0;
        if (g_cts)
                return 0;
-       if (g_nexball && w == WEP_GRENADE_LAUNCHER)
+       if (g_nexball && w == WEP_MORTAR)
                return 0;
     if(w == 0)
         return 0;