Merge branch 'master' into TimePath/spawnfunc

# Conflicts:
#	qcsrc/common/turrets/unit/ewheel.qc
#	qcsrc/common/turrets/unit/flac.qc
#	qcsrc/common/turrets/unit/fusionreactor.qc
#	qcsrc/common/turrets/unit/hellion.qc
#	qcsrc/common/turrets/unit/hk.qc
#	qcsrc/common/turrets/unit/machinegun.qc
#	qcsrc/common/turrets/unit/mlrs.qc
#	qcsrc/common/turrets/unit/phaser.qc
#	qcsrc/common/turrets/unit/plasma.qc
#	qcsrc/common/turrets/unit/plasma_dual.qc
#	qcsrc/common/turrets/unit/tesla.qc
#	qcsrc/common/turrets/unit/walker.qc
#	qcsrc/server/t_items.qc

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

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

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

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

diff --cc qcsrc/common/triggers/func/breakable.qc
Simple merge

diff --cc qcsrc/common/triggers/func/button.qc
Simple merge

diff --cc qcsrc/common/triggers/func/door.qc
Simple merge

diff --cc qcsrc/common/triggers/func/door_secret.qc
Simple merge

diff --cc qcsrc/common/triggers/func/pointparticles.qc
Simple merge

diff --cc qcsrc/common/triggers/func/train.qc
Simple merge

diff --cc qcsrc/common/triggers/target/music.qc
Simple merge

diff --cc qcsrc/common/triggers/target/speaker.qc
Simple merge

diff --cc qcsrc/common/triggers/trigger/gravity.qc
Simple merge

diff --cc qcsrc/common/triggers/trigger/heal.qc
Simple merge

diff --cc qcsrc/common/triggers/trigger/jumppads.qc
Simple merge

diff --cc qcsrc/common/triggers/trigger/keylock.qc
Simple merge

diff --cc qcsrc/common/triggers/trigger/multi.qc
Simple merge

diff --cc qcsrc/common/turrets/unit/ewheel.qc
index d4e632c4c18e2ebf41b6852f379e40fbee937563,cd111b258e6851a2d2b5450dd6ed396b7b7d98c8..117e3478324c79a96864a30688a6ddeec925d192
--- 1/qcsrc/common/turrets/unit/ewheel.qc
--- 2/qcsrc/common/turrets/unit/ewheel.qc
+++ b/qcsrc/common/turrets/unit/ewheel.qc
@@@ -121,7 -121,7 +121,7 @@@ void ewheel_move_idle(
          movelib_beak_simple((autocvar_g_turrets_unit_ewheel_speed_stop));
  }
  
- spawnfunc(turret_ewheel) { if(!turret_initialize(TUR_EWHEEL)) remove(self); }
 -void spawnfunc_turret_ewheel() { SELFPARAM(); if(!turret_initialize(TUR_EWHEEL.m_id)) remove(self); }
++spawnfunc(turret_ewheel) { if(!turret_initialize(TUR_EWHEEL.m_id)) remove(self); }
  
  float t_ewheel(float req)
  {SELFPARAM();

diff --cc qcsrc/common/turrets/unit/flac.qc
index b819ae9507d47e547f00abd538d5a8079eade54c,e19116067ee037cb4d12aff94ec2c9f982095fe2..3b9330f7e445f2df9791059cd5fc1df06f5c6af5
--- 1/qcsrc/common/turrets/unit/flac.qc
--- 2/qcsrc/common/turrets/unit/flac.qc
+++ b/qcsrc/common/turrets/unit/flac.qc
@@@ -28,7 -28,7 +28,7 @@@ void turret_flac_projectile_think_explo
      remove(self);
  }
  
- spawnfunc(turret_flac) { if(!turret_initialize(TUR_FLAC)) remove(self); }
 -void spawnfunc_turret_flac() { SELFPARAM(); if(!turret_initialize(TUR_FLAC.m_id)) remove(self); }
++spawnfunc(turret_flac) { if(!turret_initialize(TUR_FLAC.m_id)) remove(self); }
  
  float t_flac(float req)
  {SELFPARAM();

diff --cc qcsrc/common/turrets/unit/fusionreactor.qc
index c1e2f5d4558220a32955efedb6546f2bb4d4563b,5a8df2aad16a20e40e1a0177cf91ca599f26aa26..3b6389a96428a66be641f4012987dd652db9ef1f
--- 1/qcsrc/common/turrets/unit/fusionreactor.qc
--- 2/qcsrc/common/turrets/unit/fusionreactor.qc
+++ b/qcsrc/common/turrets/unit/fusionreactor.qc
@@@ -40,7 -40,7 +40,7 @@@ bool turret_fusionreactor_firecheck(
      return true;
  }
  
- spawnfunc(turret_fusionreactor) { if(!turret_initialize(TUR_FUSIONREACTOR)) remove(self); }
 -void spawnfunc_turret_fusionreactor() { SELFPARAM(); if(!turret_initialize(TUR_FUSIONREACTOR.m_id)) remove(self); }
++spawnfunc(turret_fusionreactor) { if(!turret_initialize(TUR_FUSIONREACTOR.m_id)) remove(self); }
  
  float t_fusionreactor(float req)
  {SELFPARAM();

diff --cc qcsrc/common/turrets/unit/hellion.qc
index 1b798bbaafce8e764ca05287b946e58c7d7fdfdb,56f5da90a3d70b72d9e407c2923c72f6f84aa792..a253d20ed102ee1aaba5fa06c21333d98373e5f5
--- 1/qcsrc/common/turrets/unit/hellion.qc
--- 2/qcsrc/common/turrets/unit/hellion.qc
+++ b/qcsrc/common/turrets/unit/hellion.qc
@@@ -76,7 -76,7 +76,7 @@@ void turret_hellion_missile_think(
      UpdateCSQCProjectile(self);
  }
  
- spawnfunc(turret_hellion) { if(!turret_initialize(TUR_HELLION)) remove(self); }
 -void spawnfunc_turret_hellion() { SELFPARAM(); if(!turret_initialize(TUR_HELLION.m_id)) remove(self); }
++spawnfunc(turret_hellion) { if(!turret_initialize(TUR_HELLION.m_id)) remove(self); }
  
  float t_hellion(float req)
  {SELFPARAM();

diff --cc qcsrc/common/turrets/unit/hk.qc
index 4dcbe9592dff0820d7389f4418bb59df96da32bd,106c982ae8cfa8d8b5d2832f9891740cf086241f..25235734badd158eeb3ff3f46a5e43d9b93cff94
--- 1/qcsrc/common/turrets/unit/hk.qc
--- 2/qcsrc/common/turrets/unit/hk.qc
+++ b/qcsrc/common/turrets/unit/hk.qc
@@@ -273,7 -273,7 +273,7 @@@ float turret_hk_addtarget(entity e_targ
      return 0;
  }
  
- spawnfunc(turret_hk) { if(!turret_initialize(TUR_HK)) remove(self); }
 -void spawnfunc_turret_hk() { SELFPARAM(); if(!turret_initialize(TUR_HK.m_id)) remove(self); }
++spawnfunc(turret_hk) { if(!turret_initialize(TUR_HK.m_id)) remove(self); }
  
  float t_hk(float req)
  {SELFPARAM();

diff --cc qcsrc/common/turrets/unit/machinegun.qc
index bde4f560b4b3aa45aa0a04b9a1475d109ce8c0a3,35f1921edae621cca8681943bb5d8c80fdd73651..eeb889022b1610fb32c18d85bdea1a2a27dff18f
--- 1/qcsrc/common/turrets/unit/machinegun.qc
--- 2/qcsrc/common/turrets/unit/machinegun.qc
+++ b/qcsrc/common/turrets/unit/machinegun.qc
@@@ -11,7 -11,7 +11,7 @@@ REGISTER_TURRET
  );
  #else
  #ifdef SVQC
- spawnfunc(turret_machinegun) { if(!turret_initialize(TUR_MACHINEGUN)) remove(self); }
 -void spawnfunc_turret_machinegun() { SELFPARAM(); if(!turret_initialize(TUR_MACHINEGUN.m_id)) remove(self); }
++spawnfunc(turret_machinegun) { if(!turret_initialize(TUR_MACHINEGUN.m_id)) remove(self); }
  
  void W_MachineGun_MuzzleFlash(void);
  

diff --cc qcsrc/common/turrets/unit/mlrs.qc
index 9ae66630756b32c99872a702bb610847ccbddb72,21e0a435d7a951619029d085a63d12fc113196a7..7e130c6e18907d57182f8427525f332eb9b54c82
--- 1/qcsrc/common/turrets/unit/mlrs.qc
--- 2/qcsrc/common/turrets/unit/mlrs.qc
+++ b/qcsrc/common/turrets/unit/mlrs.qc
@@@ -11,7 -11,7 +11,7 @@@ REGISTER_TURRET
  );
  #else
  #ifdef SVQC
- spawnfunc(turret_mlrs) { if(!turret_initialize(TUR_MLRS)) remove(self); }
 -void spawnfunc_turret_mlrs() { SELFPARAM(); if(!turret_initialize(TUR_MLRS.m_id)) remove(self); }
++spawnfunc(turret_mlrs) { if(!turret_initialize(TUR_MLRS.m_id)) remove(self); }
  
  float t_mlrs(float req)
  {SELFPARAM();

diff --cc qcsrc/common/turrets/unit/phaser.qc
index ca947623e106afaf76421c8112feb109ac5db04c,04e226448405b58acfa9786be112c38918887616..6eec37ab4d6532abaaa5e20d9b49480e18e11f25
--- 1/qcsrc/common/turrets/unit/phaser.qc
--- 2/qcsrc/common/turrets/unit/phaser.qc
+++ b/qcsrc/common/turrets/unit/phaser.qc
@@@ -57,7 -57,7 +57,7 @@@ void beam_think(
  
  }
  
- spawnfunc(turret_phaser) { if(!turret_initialize(TUR_PHASER)) remove(self); }
 -void spawnfunc_turret_phaser() { SELFPARAM(); if(!turret_initialize(TUR_PHASER.m_id)) remove(self); }
++spawnfunc(turret_phaser) { if(!turret_initialize(TUR_PHASER.m_id)) remove(self); }
  
  float t_phaser(float req)
  {SELFPARAM();

diff --cc qcsrc/common/turrets/unit/plasma.qc
index 36966a1ae2f68e6741d39540e03ff6c63ce4cf1b,baafa51c66b5c1a596f68c9d0337121a75a1d073..59c0f850a76f5663cc81de0ffa53416d8da0400f
--- 1/qcsrc/common/turrets/unit/plasma.qc
--- 2/qcsrc/common/turrets/unit/plasma.qc
+++ b/qcsrc/common/turrets/unit/plasma.qc
@@@ -11,7 -11,7 +11,7 @@@ REGISTER_TURRET
  );
  #else
  #ifdef SVQC
- spawnfunc(turret_plasma) { if(!turret_initialize(TUR_PLASMA)) remove(self); }
 -void spawnfunc_turret_plasma() { SELFPARAM(); if(!turret_initialize(TUR_PLASMA.m_id)) remove(self); }
++spawnfunc(turret_plasma) { if(!turret_initialize(TUR_PLASMA.m_id)) remove(self); }
  
  float t_plasma(float req)
  {SELFPARAM();

diff --cc qcsrc/common/turrets/unit/plasma_dual.qc
index 6469c0591d3d1a16d1fdb769f2479e86b82b3252,bf3362ab897593149faff730c372e3b6653fff9f..edcf7ed21fd4c75ff6bda5c676617b4e56d04fd7
--- 1/qcsrc/common/turrets/unit/plasma_dual.qc
--- 2/qcsrc/common/turrets/unit/plasma_dual.qc
+++ b/qcsrc/common/turrets/unit/plasma_dual.qc
@@@ -11,7 -11,7 +11,7 @@@ REGISTER_TURRET
  );
  #else
  #ifdef SVQC
- spawnfunc(turret_plasma_dual) { if(!turret_initialize(TUR_PLASMA_DUAL)) remove(self); }
 -void spawnfunc_turret_plasma_dual() { SELFPARAM(); if(!turret_initialize(TUR_PLASMA_DUAL.m_id)) remove(self); }
++spawnfunc(turret_plasma_dual) { if(!turret_initialize(TUR_PLASMA_DUAL.m_id)) remove(self); }
  
  float t_plasma_dual(float req)
  {SELFPARAM();

diff --cc qcsrc/common/turrets/unit/tesla.qc
index 76f8083a9a82312bbe0b1e833daa4c949b04a1a7,d3c894b96edfe548bbbd2f1b9c9ac8c4d8641267..ebcc4e997767cd3870cb2f6e007d7d40c0db02fb
--- 1/qcsrc/common/turrets/unit/tesla.qc
--- 2/qcsrc/common/turrets/unit/tesla.qc
+++ b/qcsrc/common/turrets/unit/tesla.qc
@@@ -89,7 -89,7 +89,7 @@@ float turret_tesla_firecheck(
      return 0;
  }
  
- spawnfunc(turret_tesla) { if(!turret_initialize(TUR_TESLA)) remove(self); }
 -void spawnfunc_turret_tesla() { SELFPARAM(); if(!turret_initialize(TUR_TESLA.m_id)) remove(self); }
++spawnfunc(turret_tesla) { if(!turret_initialize(TUR_TESLA.m_id)) remove(self); }
  
  float t_tesla(float req)
  {SELFPARAM();

diff --cc qcsrc/common/turrets/unit/walker.qc
index ceacde8c2a62d7d021f9413eea59d1e107cdfd1b,792e7a338d0b080a16d4dcb4a1d0a7f69d936f4f..a2927cfbf29765be6ff5122c8525f39a34db0cca
--- 1/qcsrc/common/turrets/unit/walker.qc
--- 2/qcsrc/common/turrets/unit/walker.qc
+++ b/qcsrc/common/turrets/unit/walker.qc
@@@ -334,7 -334,7 +334,7 @@@ void walker_move_path(
  #endif
  }
  
- spawnfunc(turret_walker) { if(!turret_initialize(TUR_WALKER)) remove(self); }
 -void spawnfunc_turret_walker() { SELFPARAM(); if(!turret_initialize(TUR_WALKER.m_id)) remove(self); }
++spawnfunc(turret_walker) { if(!turret_initialize(TUR_WALKER.m_id)) remove(self); }
  
  float t_walker(float req)
  {SELFPARAM();

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

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

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

diff --cc qcsrc/common/vehicles/unit/spiderbot.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
Simple merge

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/lib/_all.inc
index 2b15e8acb4b0d60f5e5457953aca656295e1716c,cda9b3a8804e3a3ac6b7f13cf815036c528c9ea3..e7ee2746f553f5e06dbec8c491ca1982ad0e479c
--- 1/qcsrc/lib/_all.inc
--- 2/qcsrc/lib/_all.inc
+++ b/qcsrc/lib/_all.inc
@@@ -19,8 -20,8 +20,9 @@@
  #include "prandom.qc"
  #include "progname.qh"
  #include "registry.qh"
+ #include "replicate.qh"
  #include "sortlist.qc"
 +#include "spawnfunc.qh"
  #include "static.qh"
  #include "string.qh"
  #include "struct.qh"

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

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

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

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

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

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

diff --cc qcsrc/server/mutators/gamemode_nexball.qc
index 0227f96875cb3ce35a1939f09c92cf15016c7625,a318748fda952e97f28aebe85c4b9977e82a8a22..3675831acc915ff9961e7eba121a77230707acf9
--- 1/qcsrc/server/mutators/gamemode_nexball.qc
--- 2/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@@ -619,19 -619,19 +619,19 @@@ spawnfunc(nexball_pinkgoal
        SpawnGoal();
  }
  
 -void spawnfunc_nexball_fault(void)
 -{SELFPARAM();
 +spawnfunc(nexball_fault)
 +{
        self.team = GOAL_FAULT;
        if(self.noise == "")
-               self.noise = "misc/typehit.wav";
+               self.noise = SND(TYPEHIT);
        SpawnGoal();
  }
  
 -void spawnfunc_nexball_out(void)
 -{SELFPARAM();
 +spawnfunc(nexball_out)
 +{
        self.team = GOAL_OUT;
        if(self.noise == "")
-               self.noise = "misc/typehit.wav";
+               self.noise = SND(TYPEHIT);
        SpawnGoal();
  }
  

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

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

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

diff --cc qcsrc/server/t_items.qc
index c256d4df9022dc6a9fa7b8de864f2506737603fb,7d3e59836b9ebb80f85769d2de5a45130942d5d5..015d4aeb2cae9d50b22bd734a824a48e150b2e34
--- 1/qcsrc/server/t_items.qc
--- 2/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -1199,18 -1200,11 +1200,11 @@@ void StartItem (string itemmodel, strin
  void StartItemA (entity a)
  {SELFPARAM();
      self.itemdef = a;
-     StartItem(Item_Model(a.m_model), a.m_sound, a.m_respawntime(), a.m_respawntimejitter(), a.m_name, a.m_itemid, 0, a.m_itemflags, a.m_pickupevalfunc, a.m_botvalue);
+     StartItem(strzone(a.m_model.model_str()), a.m_sound, a.m_respawntime(), a.m_respawntimejitter(), a.m_name, a.m_itemid, 0, a.m_itemflags, a.m_pickupevalfunc, a.m_botvalue);
  }
  
 -void spawnfunc_item_rockets()
 -{SELFPARAM();
 +spawnfunc(item_rockets)
 +{
        if(!self.ammo_rockets)
                self.ammo_rockets = g_pickup_rockets;
        if(!self.pickup_anyway)
@@@ -1363,15 -1357,14 +1357,14 @@@ spawnfunc(item_health_mega
  }
  
  // support old misnamed entities
 -void spawnfunc_item_armor1() { spawnfunc_item_armor_small(); }  // FIXME: in Quake this is green armor, in Xonotic maps it is an armor shard
 -void spawnfunc_item_armor25() { spawnfunc_item_armor_large(); }
 -void spawnfunc_item_health1() { spawnfunc_item_health_small(); }
 -void spawnfunc_item_health25() { spawnfunc_item_health_medium(); }
 -void spawnfunc_item_health100() { spawnfunc_item_health_mega(); }
 +spawnfunc(item_armor1) { spawnfunc_item_armor_small(this); }  // FIXME: in Quake this is green armor, in Xonotic maps it is an armor shard
 +spawnfunc(item_armor25) { spawnfunc_item_armor_large(this); }
 +spawnfunc(item_health1) { spawnfunc_item_health_small(this); }
 +spawnfunc(item_health25) { spawnfunc_item_health_medium(this); }
 +spawnfunc(item_health100) { spawnfunc_item_health_mega(this); }
  
 -void spawnfunc_item_strength()
 -{SELFPARAM();
 +spawnfunc(item_strength)
 +{
-               precache_sound("weapons/strength_fire.wav");
                if(!self.strength_finished)
                        self.strength_finished = autocvar_g_balance_powerup_strength_time;
                StartItemA (ITEM_Strength);