From: Mario <mario@smbclan.net>
Date: Mon, 22 Aug 2016 11:13:54 +0000 (+1000)
Subject: Hopefully fix gameplay change
X-Git-Tag: xonotic-v0.8.2~663^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F361%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Hopefully fix gameplay change
---

diff --git a/qcsrc/common/triggers/func/conveyor.qc b/qcsrc/common/triggers/func/conveyor.qc
index d8bc80c36..90328da23 100644
--- a/qcsrc/common/triggers/func/conveyor.qc
+++ b/qcsrc/common/triggers/func/conveyor.qc
@@ -1,9 +1,6 @@
 #include "conveyor.qh"
 REGISTER_NET_LINKED(ENT_CLIENT_CONVEYOR)
 
-IntrusiveList g_conveyed;
-STATIC_INIT(g_conveyed) { g_conveyed = IL_NEW(); }
-
 void conveyor_think(entity this)
 {
 #ifdef CSQC
diff --git a/qcsrc/common/triggers/func/conveyor.qh b/qcsrc/common/triggers/func/conveyor.qh
index 6f70f09be..c12b52d2d 100644
--- a/qcsrc/common/triggers/func/conveyor.qh
+++ b/qcsrc/common/triggers/func/conveyor.qh
@@ -1 +1,4 @@
 #pragma once
+
+IntrusiveList g_conveyed;
+STATIC_INIT(g_conveyed) { g_conveyed = IL_NEW(); }
diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index a6da6ce62..a61dc0f03 100644
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -692,6 +692,7 @@ void W_Arc_Beam(float burst, entity actor, .entity weaponentity)
 	beam.owner = actor;
 	set_movetype(beam, MOVETYPE_NONE);
 	beam.bot_dodge = true;
+	IL_PUSH(g_bot_dodge, beam);
 	beam.bot_dodgerating = WEP_CVAR(arc, beam_damage);
 	beam.beam_bursting = burst;
 	Net_LinkEntity(beam, false, 0, W_Arc_Beam_Send);
diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc
index a104f952f..7e05241a4 100644
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@ -341,6 +341,8 @@ void W_Electro_Orb_Stick(entity this, entity to)
 	newproj.nextthink = this.nextthink;
 	newproj.use = this.use;
 	newproj.flags = this.flags;
+	IL_PUSH(g_projectiles, newproj);
+	IL_PUSH(g_bot_dodge, newproj);
 
 	delete(this);
 
diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index 73b8c9d92..0c563d1ff 100644
--- a/qcsrc/server/bot/default/navigation.qc
+++ b/qcsrc/server/bot/default/navigation.qc
@@ -1000,7 +1000,7 @@ void botframe_updatedangerousobjects(float maxupdate)
 		danger = 0;
 		m1 = it.mins;
 		m2 = it.maxs;
-		IL_EACH(g_bot_dodge, true,
+		IL_EACH(g_bot_dodge, it.bot_dodge,
 		{
 			v = it.origin;
 			v.x = bound(m1_x, v.x, m2_x);
diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index f06f9ae65..9f044c3c6 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -27,6 +27,7 @@
 
 #include <common/effects/qc/globalsound.qh>
 
+#include "../common/triggers/func/conveyor.qh"
 #include "../common/triggers/teleporters.qh"
 
 #include "../common/vehicles/all.qh"