From: terencehill <piuntn@gmail.com>
Date: Mon, 12 Sep 2016 17:04:46 +0000 (+0200)
Subject: Fix vehicles getting attacked by turrets when the game is over
X-Git-Tag: xonotic-v0.8.2~593
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d890ade255346f7abeb02831479c8c340f2113d3;p=xonotic%2Fxonotic-data.pk3dir.git

Fix vehicles getting attacked by turrets when the game is over
---

diff --git a/qcsrc/common/vehicles/vehicle/bumblebee.qc b/qcsrc/common/vehicles/vehicle/bumblebee.qc
index 8fbeb3f99..3f5f40435 100644
--- a/qcsrc/common/vehicles/vehicle/bumblebee.qc
+++ b/qcsrc/common/vehicles/vehicle/bumblebee.qc
@@ -393,8 +393,8 @@ bool bumblebee_pilot_frame(entity this, float dt)
 
 	if(intermission_running)
 	{
-		vehic.velocity = '0 0 0';
-		vehic.avelocity = '0 0 0';
+		vehic.solid = SOLID_NOT;
+		vehic.takedamage = DAMAGE_NO;
 		set_movetype(vehic, MOVETYPE_NONE);
 		return;
 	}
diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc
index 09db15c4d..41a31743f 100644
--- a/qcsrc/common/vehicles/vehicle/racer.qc
+++ b/qcsrc/common/vehicles/vehicle/racer.qc
@@ -153,8 +153,8 @@ bool racer_frame(entity this, float dt)
 
 	if(intermission_running)
 	{
-		vehic.velocity = '0 0 0';
-		vehic.avelocity = '0 0 0';
+		vehic.solid = SOLID_NOT;
+		vehic.takedamage = DAMAGE_NO;
 		set_movetype(vehic, MOVETYPE_NONE);
 		return;
 	}
diff --git a/qcsrc/common/vehicles/vehicle/raptor.qc b/qcsrc/common/vehicles/vehicle/raptor.qc
index 0f638569b..1068e7430 100644
--- a/qcsrc/common/vehicles/vehicle/raptor.qc
+++ b/qcsrc/common/vehicles/vehicle/raptor.qc
@@ -135,8 +135,8 @@ bool raptor_frame(entity this, float dt)
 
 	if(intermission_running)
 	{
-		vehic.velocity = '0 0 0';
-		vehic.avelocity = '0 0 0';
+		vehic.solid = SOLID_NOT;
+		vehic.takedamage = DAMAGE_NO;
 		set_movetype(vehic, MOVETYPE_NONE);
 		return;
 	}
diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qc b/qcsrc/common/vehicles/vehicle/spiderbot.qc
index b8c3caa74..347d2120a 100644
--- a/qcsrc/common/vehicles/vehicle/spiderbot.qc
+++ b/qcsrc/common/vehicles/vehicle/spiderbot.qc
@@ -50,8 +50,8 @@ bool spiderbot_frame(entity this, float dt)
 
 	if(intermission_running)
 	{
-		vehic.velocity = '0 0 0';
-		vehic.avelocity = '0 0 0';
+		vehic.solid = SOLID_NOT;
+		vehic.takedamage = DAMAGE_NO;
 		set_movetype(vehic, MOVETYPE_NONE);
 		return;
 	}