Merge branch 'master' into TimePath/spawnfunc 227/head
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 3 Oct 2015 07:17:49 +0000 (17:17 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 3 Oct 2015 07:19:10 +0000 (17:19 +1000)
# 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

66 files changed:
1  2 
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/triggers/func/breakable.qc
qcsrc/common/triggers/func/button.qc
qcsrc/common/triggers/func/door.qc
qcsrc/common/triggers/func/door_secret.qc
qcsrc/common/triggers/func/pointparticles.qc
qcsrc/common/triggers/func/train.qc
qcsrc/common/triggers/target/music.qc
qcsrc/common/triggers/target/speaker.qc
qcsrc/common/triggers/trigger/gravity.qc
qcsrc/common/triggers/trigger/heal.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/triggers/trigger/keylock.qc
qcsrc/common/triggers/trigger/multi.qc
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/common/vehicles/unit/bumblebee.qc
qcsrc/common/vehicles/unit/racer.qc
qcsrc/common/vehicles/unit/raptor.qc
qcsrc/common/vehicles/unit/spiderbot.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/blaster.qc
qcsrc/common/weapons/weapon/crylink.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/fireball.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/hlac.qc
qcsrc/common/weapons/weapon/hmg.qc
qcsrc/common/weapons/weapon/hook.qc
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/porto.qc
qcsrc/common/weapons/weapon/rifle.qc
qcsrc/common/weapons/weapon/rpc.qc
qcsrc/common/weapons/weapon/seeker.qc
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/lib/_all.inc
qcsrc/server/cheats.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/item_key.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_domination.qc
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/server/mutators/mutator_overkill.qc
qcsrc/server/t_items.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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();
@@@ -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();
@@@ -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();
@@@ -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();
@@@ -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();
@@@ -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);
  
@@@ -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();
@@@ -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();
@@@ -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();
@@@ -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();
@@@ -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();
@@@ -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();
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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();
  }
  
@@@ -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);