]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix vehicles getting attacked by turrets when the game is over
authorterencehill <piuntn@gmail.com>
Mon, 12 Sep 2016 17:04:46 +0000 (19:04 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 12 Sep 2016 17:04:46 +0000 (19:04 +0200)
qcsrc/common/vehicles/vehicle/bumblebee.qc
qcsrc/common/vehicles/vehicle/racer.qc
qcsrc/common/vehicles/vehicle/raptor.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc

index 8fbeb3f993ca5c890c10187d5f679d59ada5df6c..3f5f40435819d6de9b7f748eeb7724af411623c6 100644 (file)
@@ -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;
        }
index 09db15c4dabfe7a55985446bc18f3ecb9c31319e..41a31743f621d94fcd8c35db61f72d499feeeded 100644 (file)
@@ -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;
        }
index 0f638569b955d71efe74cc201fdc41c4576c96df..1068e7430dd47a8cc36b008575f2077b98071d9e 100644 (file)
@@ -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;
        }
index b8c3caa741150bcb78776b92609d8b1deeb8e425..347d2120aa1a17155db038821fbfcdc6f880c5f8 100644 (file)
@@ -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;
        }