]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
deal vehicle damage if g_br_ring_exitvehicle is not set
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Wed, 26 Jan 2022 18:13:39 +0000 (19:13 +0100)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Wed, 26 Jan 2022 18:13:39 +0000 (19:13 +0100)
qcsrc/common/gamemodes/gamemode/br/sv_br.qc

index 131e53576f546e1578e8c2724e04c5f8ea8bfa1f..16bad1b27154ad53f689b54932ddbbc3bbb485e1 100644 (file)
@@ -245,8 +245,13 @@ MUTATOR_HOOKFUNCTION(br, PlayerPreThink, CBC_ORDER_FIRST)
                 Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_BR_RING_WARN);
             }
 
-            if(player.vehicle && autocvar_g_br_ring_exitvehicle) // if the player is controlling a vehicle
-                vehicles_exit(player.vehicle, VHEF_RELEASE); // begone!
+            if(player.vehicle) // if the player is controlling a vehicle
+            {
+                if(autocvar_g_br_ring_exitvehicle)
+                    vehicles_exit(player.vehicle, VHEF_RELEASE); // begone!
+                else
+                    vehicles_damage(player.vehicle, ring, ring, 10 * ring.strength * frametime, DEATH_RING.m_id, DMG_NOWEP, player.vehicle.origin, '0 0 0');
+            }
 
             Damage(player, ring, ring, ring.strength * frametime, DEATH_RING.m_id, DMG_NOWEP, player.origin, '0 0 0'); // ring damage
         }