Merge branch 'master' into TimePath/universal_weapons

# Conflicts:
#	qcsrc/common/turrets/unit/plasma_dual.qc

diff --cc qcsrc/client/damage.qc
Simple merge

diff --cc qcsrc/client/view.qc
Simple merge

diff --cc qcsrc/common/monsters/monster/mage.qc
Simple merge

diff --cc qcsrc/common/turrets/unit/plasma_dual.qc
index 1744f54f5157dbac645143c78f68a26780ce90e3,bf3362ab897593149faff730c372e3b6653fff9f..8b2bc252ef092f86565e6a9b88ad8e37a83afaa7
--- 1/qcsrc/common/turrets/unit/plasma_dual.qc
--- 2/qcsrc/common/turrets/unit/plasma_dual.qc
+++ b/qcsrc/common/turrets/unit/plasma_dual.qc
@@@ -10,37 -10,8 +10,37 @@@ REGISTER_TURRET
  /* fullname   */ _("Dual Plasma Cannon")
  );
  #else
 +
 +#include "../../weapons/all.qh"
 +
 +CLASS(PlasmaDualAttack, PortoLaunch)
 +/* flags     */ ATTRIB(PlasmaDualAttack, spawnflags, int, WEP_TYPE_OTHER);
 +/* impulse   */ ATTRIB(PlasmaDualAttack, impulse, int, 5);
 +/* refname   */ ATTRIB(PlasmaDualAttack, netname, string, "plasmadual");
 +/* wepname   */ ATTRIB(PlasmaDualAttack, message, string, _("Dual plasma"));
 +ENDCLASS(PlasmaDualAttack)
 +REGISTER_WEAPON(PLASMA_DUAL, NEW(PlasmaDualAttack));
 +
  #ifdef SVQC
- void spawnfunc_turret_plasma_dual() { SELFPARAM(); if(!turret_initialize(TUR_PLASMA_DUAL)) remove(self); }
 +
 +float t_plasma_dual(float req);
 +METHOD(PlasmaDualAttack, wr_think, bool(entity thiswep)) {
 +      SELFPARAM();
 +      if (self.BUTTON_ATCK)
 +      if (weapon_prepareattack(0, WEP_CVAR_PRI(electro, refire))) {
 +              W_SetupShot_Dir(self, v_forward, false, 0, W_Sound("electro_fire"), CH_WEAPON_B, 0);
 +              self.tur_shotdir_updated = w_shotdir;
 +              self.tur_shotorg = w_shotorg;
 +              self.tur_head = self;
 +        self.shot_speed = max(1, ((!self.shot_speed) ? 2500 : self.shot_speed));
 +        self.shot_spread = bound(0.0001, ((!self.shot_spread) ? 0.0125 : self.shot_spread), 500);
 +              t_plasma_dual(TR_ATTACK);
 +              weapon_thinkf(WFRAME_FIRE1, WEP_CVAR_PRI(electro, animtime), w_ready);
 +      }
 +      return true;
 +}
 +
+ void spawnfunc_turret_plasma_dual() { SELFPARAM(); if(!turret_initialize(TUR_PLASMA_DUAL.m_id)) remove(self); }
  
  float t_plasma_dual(float req)
  {SELFPARAM();

diff --cc qcsrc/common/vehicles/unit/racer.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/arc.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/blaster.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/crylink.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/devastator.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/electro.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/fireball.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/hagar.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/hlac.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/hmg.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/hook.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/machinegun.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/minelayer.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/mortar.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/porto.qc
index 765f2606b1e9b52cc568601768d8316994437b21,d764286b705dd099154a55c2c9e286576fc636f2..7e8b282188316659c1f9eefa898131b7b586f429
--- 1/qcsrc/common/weapons/weapon/porto.qc
--- 2/qcsrc/common/weapons/weapon/porto.qc
+++ b/qcsrc/common/weapons/weapon/porto.qc
@@@ -364,19 -371,8 +364,13 @@@ void W_Porto_Attack(float type
                        // always allow infinite ammo
                        return true;
                }
 -              case WR_INIT:
 +              METHOD(PortoLaunch, wr_checkammo2, bool(entity this))
 +              {
 +                      // always allow infinite ammo
 +                      return true;
 +              }
 +              METHOD(PortoLaunch, wr_init, bool(entity this))
                {
-                       precache_sound("porto/bounce.wav");
-                       precache_sound("porto/create.wav");
-                       precache_sound("porto/expire.wav");
-                       precache_sound("porto/explode.wav");
-                       precache_sound("porto/fire.wav");
-                       precache_sound("porto/unsupported.wav");
                        PORTO_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }

diff --cc qcsrc/common/weapons/weapon/rifle.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/rpc.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/seeker.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/shockwave.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/shotgun.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/vaporizer.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/vortex.qc
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/cl_player.qc
Simple merge

diff --cc qcsrc/server/defs.qh
Simple merge

diff --cc qcsrc/server/g_hook.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qh
Simple merge

diff --cc qcsrc/server/mutators/gamemode_nexball.qc
Simple merge

diff --cc qcsrc/server/t_items.qc
index e6e45963cecc9267bc553ff618bb0bcbb5e3ff0c,7d3e59836b9ebb80f85769d2de5a45130942d5d5..c921502cf390f442b5cdf618c34585e1389afa64
--- 1/qcsrc/server/t_items.qc
--- 2/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -1840,22 -1826,22 +1826,22 @@@ float GiveItems(entity e, float beginar
                wi = get_weaponinfo(j);
                if(wi.weapon)
                {
-                       POSTGIVE_WEAPON(e, j, W_Sound("weaponpickup"), string_null);
+                       POSTGIVE_WEAPON(e, j, SND(WEAPONPICKUP), string_null);
                        if (!(save_weapons & WepSet_FromWeapon(j)))
                                if(e.weapons & WepSet_FromWeapon(j))
 -                                      WEP_ACTION(wi.weapon, WR_INIT);
 +                                      _WEP_ACTION(wi.weapon, WR_INIT);
                }
        }
-       POSTGIVE_VALUE(e, strength_finished, 1, "misc/powerup.wav", "misc/poweroff.wav");
-       POSTGIVE_VALUE(e, invincible_finished, 1, "misc/powerup_shield.wav", "misc/poweroff.wav");
-       POSTGIVE_VALUE(e, ammo_nails, 0, "misc/itempickup.wav", string_null);
-       POSTGIVE_VALUE(e, ammo_cells, 0, "misc/itempickup.wav", string_null);
-       POSTGIVE_VALUE(e, ammo_plasma, 0, "misc/itempickup.wav", string_null);
-       POSTGIVE_VALUE(e, ammo_shells, 0, "misc/itempickup.wav", string_null);
-       POSTGIVE_VALUE(e, ammo_rockets, 0, "misc/itempickup.wav", string_null);
-       POSTGIVE_VALUE_ROT(e, ammo_fuel, 1, pauserotfuel_finished, autocvar_g_balance_pause_fuel_rot, pauseregen_finished, autocvar_g_balance_pause_fuel_regen, "misc/itempickup.wav", string_null);
-       POSTGIVE_VALUE_ROT(e, armorvalue, 1, pauserotarmor_finished, autocvar_g_balance_pause_armor_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, "misc/armor25.wav", string_null);
-       POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, autocvar_g_balance_pause_health_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, "misc/megahealth.wav", string_null);
+       POSTGIVE_VALUE(e, strength_finished, 1, SND(POWERUP), SND(POWEROFF));
+       POSTGIVE_VALUE(e, invincible_finished, 1, "misc/powerup_shield.wav", SND(POWEROFF));
+       POSTGIVE_VALUE(e, ammo_nails, 0, SND(ITEMPICKUP), string_null);
+       POSTGIVE_VALUE(e, ammo_cells, 0, SND(ITEMPICKUP), string_null);
+       POSTGIVE_VALUE(e, ammo_plasma, 0, SND(ITEMPICKUP), string_null);
+       POSTGIVE_VALUE(e, ammo_shells, 0, SND(ITEMPICKUP), string_null);
+       POSTGIVE_VALUE(e, ammo_rockets, 0, SND(ITEMPICKUP), string_null);
+       POSTGIVE_VALUE_ROT(e, ammo_fuel, 1, pauserotfuel_finished, autocvar_g_balance_pause_fuel_rot, pauseregen_finished, autocvar_g_balance_pause_fuel_regen, SND(ITEMPICKUP), string_null);
+       POSTGIVE_VALUE_ROT(e, armorvalue, 1, pauserotarmor_finished, autocvar_g_balance_pause_armor_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, SND(ARMOR25), string_null);
+       POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, autocvar_g_balance_pause_health_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, SND(MEGAHEALTH), string_null);
  
        if(e.superweapons_finished <= 0)
                if(self.weapons & WEPSET_SUPERWEAPONS)

diff --cc qcsrc/server/weapons/selection.qc
Simple merge

diff --cc qcsrc/server/weapons/spawning.qc
index 95d02a1d5f9ed094ea7c18c49de1ab16ff28484e,81261383f5f061b3aeeb001fb4e2e0c1bd7a2179..4fb84744c9a9264b12f8e96625a479f6cdaee467
--- 1/qcsrc/server/weapons/spawning.qc
--- 2/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@@ -177,9 -177,10 +177,10 @@@ void weapon_defaultspawnfunc(float wpn
        if(self.team)
                f |= FL_NO_WEAPON_STAY;
  
-       StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapon, f, weapon_pickupevalfunc, e.bot_pickupbasevalue);
+       StartItem(e.model, string_null, self.respawntime, self.respawntimejitter, e.message, 0, e.weapon, f, weapon_pickupevalfunc, e.bot_pickupbasevalue);
+       self.item_pickupsound_ent = SND_WEAPONPICKUP;
        #if 0 // WEAPONTODO
        if (self.modelindex) // don't precache if self was removed
 -              WEP_ACTION(e.weapon, WR_INIT);
 +              _WEP_ACTION(e.weapon, WR_INIT);
        #endif
  }

diff --cc qcsrc/server/weapons/weaponsystem.qc
Simple merge