Merge branch 'master' into Lyberta/FilterItemDefinition

diff --combined qcsrc/server/defs.qh
index 138752f13198a83f4cbabd8f8b538379ab18d262,61770f01a71d4744038cb52e2baef86f6f903dc9..f85d6e2b6f22ae53ff521c4e52668c635f5dd5f4
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -182,6 -182,8 +182,6 @@@ float default_weapon_alpha
  
  string gamemode_name;
  
 -float startitem_failed;
 -
  string W_Apply_Weaponreplace(string in);
  
  void FixIntermissionClient(entity e);
@@@ -406,67 -408,43 +406,43 @@@ const int MIF_GUIDED_CONFUSABLE = MIF_G
  .WepSet dual_weapons;
  
  IntrusiveList g_monsters;
- STATIC_INIT(g_monsters) { g_monsters = IL_NEW(); }
- 
  IntrusiveList g_waypoints;
- STATIC_INIT(g_waypoints) { g_waypoints = IL_NEW(); }
- 
  IntrusiveList g_vehicles;
- STATIC_INIT(g_vehicles) { g_vehicles = IL_NEW(); }
- 
  IntrusiveList g_turrets;
- STATIC_INIT(g_turrets) { g_turrets = IL_NEW(); }
- 
  IntrusiveList g_mines;
- STATIC_INIT(g_mines) { g_mines = IL_NEW(); }
- 
  IntrusiveList g_projectiles;
- STATIC_INIT(g_projectiles) { g_projectiles = IL_NEW(); }
- 
  IntrusiveList g_items;
- STATIC_INIT(g_items) { g_items = IL_NEW(); }
- 
  IntrusiveList g_initforplayer;
- STATIC_INIT(g_initforplayer) { g_initforplayer = IL_NEW(); }
- 
  IntrusiveList g_clones;
- STATIC_INIT(g_clones) { g_clones = IL_NEW(); }
- 
- IntrusiveList g_assault_destructibles;
- STATIC_INIT(g_assault_destructibles) { g_assault_destructibles = IL_NEW(); }
- 
- IntrusiveList g_assault_objectivedecreasers;
- STATIC_INIT(g_assault_objectivedecreasers) { g_assault_objectivedecreasers = IL_NEW(); }
- 
- IntrusiveList g_assault_objectives;
- STATIC_INIT(g_assault_objectives) { g_assault_objectives = IL_NEW(); }
- 
  IntrusiveList g_spawnpoints;
- STATIC_INIT(g_spawnpoints) { g_spawnpoints = IL_NEW(); }
- 
  IntrusiveList g_bot_targets;
- STATIC_INIT(g_bot_targets) { g_bot_targets = IL_NEW(); }
- 
  IntrusiveList g_bot_dodge;
- STATIC_INIT(g_bot_dodge) { g_bot_dodge = IL_NEW(); }
- 
  IntrusiveList g_damagedbycontents;
- STATIC_INIT(g_damagedbycontents) { g_damagedbycontents = IL_NEW(); }
- 
  IntrusiveList g_railgunhit;
- STATIC_INIT(g_railgunhit) { g_railgunhit = IL_NEW(); }
- 
  IntrusiveList g_ladders;
- STATIC_INIT(g_ladders) { g_ladders = IL_NEW(); }
- 
  IntrusiveList g_locations;
- STATIC_INIT(g_locations) { g_locations = IL_NEW(); }
- 
  IntrusiveList g_saved_team;
- STATIC_INIT(g_saved_team) { g_saved_team = IL_NEW(); }
- 
  IntrusiveList g_monster_targets;
- STATIC_INIT(g_monster_targets) { g_monster_targets = IL_NEW(); }
- 
  IntrusiveList g_pathlib_nodes;
- STATIC_INIT(g_pathlib_nodes) { g_pathlib_nodes = IL_NEW(); }
+ STATIC_INIT(defs)
+ {
+       g_monsters = IL_NEW();
+       g_waypoints = IL_NEW();
+       g_vehicles = IL_NEW();
+       g_turrets = IL_NEW();
+       g_mines = IL_NEW();
+       g_projectiles = IL_NEW();
+       g_items = IL_NEW();
+       g_initforplayer = IL_NEW();
+       g_clones = IL_NEW();
+       g_spawnpoints = IL_NEW();
+       g_bot_targets = IL_NEW();
+       g_bot_dodge = IL_NEW();
+       g_damagedbycontents = IL_NEW();
+       g_railgunhit = IL_NEW();
+       g_ladders = IL_NEW();
+       g_locations = IL_NEW();
+       g_saved_team = IL_NEW();
+       g_monster_targets = IL_NEW();
+       g_pathlib_nodes = IL_NEW();
+ }