From: Mario <mario@smbclan.net>
Date: Sat, 27 Aug 2016 05:50:24 +0000 (+1000)
Subject: Merge branch 'master' into Mario/intrusive_2
X-Git-Tag: xonotic-v0.8.2~474^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=393022c0e9b00481e68d1db786e96e4ffb7f37e0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/intrusive_2
---

393022c0e9b00481e68d1db786e96e4ffb7f37e0
diff --cc qcsrc/common/monsters/monster/spider.qc
index 5723dafe6,d2cb8313e..4d701d047
--- a/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@@ -161,8 -159,8 +159,9 @@@ void M_Spider_Attack_Web(entity this
  	proj.event_damage = func_null;
  	proj.flags = FL_PROJECTILE;
  	IL_PUSH(g_projectiles, proj);
+ 	IL_PUSH(g_bot_dodge, proj);
  	proj.damagedbycontents = true;
 +	IL_PUSH(g_damagedbycontents, proj);
  
  	proj.bouncefactor = 0.3;
  	proj.bouncestop = 0.05;
diff --cc qcsrc/common/weapons/weapon/electro.qc
index d28167097,7e05241a4..319f0d1d7
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@@ -449,9 -451,8 +452,10 @@@ void W_Electro_Attack_Orb(Weapon thiswe
  	proj.event_damage = W_Electro_Orb_Damage;
  	proj.flags = FL_PROJECTILE;
  	IL_PUSH(g_projectiles, proj);
+ 	IL_PUSH(g_bot_dodge, proj);
  	proj.damagedbycontents = (WEP_CVAR_SEC(electro, damagedbycontents));
 +	if(proj.damagedbycontents)
 +		IL_PUSH(g_damagedbycontents, proj);
  
  	proj.bouncefactor = WEP_CVAR_SEC(electro, bouncefactor);
  	proj.bouncestop = WEP_CVAR_SEC(electro, bouncestop);
diff --cc qcsrc/server/defs.qh
index 9a53c1305,b03496890..49e7236d2
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -426,12 -426,8 +426,11 @@@ const int MIF_GUIDED_CONFUSABLE = MIF_G
  
  .string cvar_cl_physics;
  
- .bool init_for_player_needed;
  .void(entity this, entity player) init_for_player;
  
 +IntrusiveList g_damagedbycontents;
 +STATIC_INIT(g_damagedbycontents) { g_damagedbycontents = IL_NEW(); }
 +
  IntrusiveList g_monsters;
  STATIC_INIT(g_monsters) { g_monsters = IL_NEW(); }