From: Mario <mario@smbclan.net>
Date: Sun, 18 Jun 2017 06:01:03 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~84
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=54f63f7e208b41d4f4c348a319859c69ebdb9744;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters

# Conflicts:
#	qcsrc/server/defs.qh
---

54f63f7e208b41d4f4c348a319859c69ebdb9744
diff --cc qcsrc/server/defs.qh
index 9fc2c60591,ca7430de31..7c0c572686
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -468,5 -468,14 +468,17 @@@ STATIC_INIT(g_bot_dodge) { g_bot_dodge 
  IntrusiveList g_damagedbycontents;
  STATIC_INIT(g_damagedbycontents) { g_damagedbycontents = IL_NEW(); }
  
 +IntrusiveList g_monster_targets;
 +STATIC_INIT(g_monster_targets) { g_monster_targets = 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(); }