Don't allow pressing F to enter a vehicle when in independent players mode, fixes...

diff --git a/qcsrc/common/mutators/mutator/touchexplode/sv_touchexplode.qc b/qcsrc/common/mutators/mutator/touchexplode/sv_touchexplode.qc
index 6be2c5963b69f4515b05b97be642e82b4b18560b..5d46a9edf0d0f732ca49373acdbc2feed4245512 100644 (file)
--- a/qcsrc/common/mutators/mutator/touchexplode/sv_touchexplode.qc
+++ b/qcsrc/common/mutators/mutator/touchexplode/sv_touchexplode.qc
@@ -28,21 +28,15 @@ MUTATOR_HOOKFUNCTION(touchexplode, PlayerPreThink)
 {
        entity player = M_ARGV(0, entity);
 
 {
        entity player = M_ARGV(0, entity);
 

-       if(time > player.touchexplode_time)
-       if(!game_stopped)
-       if(!STAT(FROZEN, player))
-       if(IS_PLAYER(player))
-       if(!IS_DEAD(player))
-       if(!IS_INDEPENDENT_PLAYER(player))
+       if(time > player.touchexplode_time && !game_stopped && !IS_DEAD(player) && IS_PLAYER(player) && !STAT(FROZEN, player) && !IS_INDEPENDENT_PLAYER(player))
+       {

                FOREACH_CLIENT(IS_PLAYER(it) && it != player, {
                FOREACH_CLIENT(IS_PLAYER(it) && it != player, {

-                       if(time > it.touchexplode_time)
-                       if(!STAT(FROZEN, it))
-                       if(!IS_DEAD(it))
-                       if (!IS_INDEPENDENT_PLAYER(it))
+                       if(time > it.touchexplode_time && !STAT(FROZEN, it) && !IS_DEAD(it) && !IS_INDEPENDENT_PLAYER(it))

                        if(boxesoverlap(player.absmin, player.absmax, it.absmin, it.absmax))
                        {
                                PlayerTouchExplode(player, it);
                                player.touchexplode_time = it.touchexplode_time = time + 0.2;
                        }
                });
                        if(boxesoverlap(player.absmin, player.absmax, it.absmin, it.absmax))
                        {
                                PlayerTouchExplode(player, it);
                                player.touchexplode_time = it.touchexplode_time = time + 0.2;
                        }
                });

+       }

 }
 }

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 1bb51fdb7230907caed5b35a7e331278217f38d6..f873809b0d791ae8ee8e9b199790fb5560f720f5 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2473,7 +2473,7 @@ void PlayerPreThink (entity this)
        MUTATOR_CALLHOOK(PlayerPreThink, this);
 
        if(autocvar_g_vehicles_enter && (time > this.last_vehiclecheck) && !game_stopped && !this.vehicle)
        MUTATOR_CALLHOOK(PlayerPreThink, this);
 
        if(autocvar_g_vehicles_enter && (time > this.last_vehiclecheck) && !game_stopped && !this.vehicle)

-       if(IS_PLAYER(this) && !STAT(FROZEN, this) && !IS_DEAD(this))
+       if(IS_PLAYER(this) && !STAT(FROZEN, this) && !IS_DEAD(this) && !IS_INDEPENDENT_PLAYER(this))

        {
                FOREACH_ENTITY_RADIUS(this.origin, autocvar_g_vehicles_enter_radius, IS_VEHICLE(it),
                {
        {
                FOREACH_ENTITY_RADIUS(this.origin, autocvar_g_vehicles_enter_radius, IS_VEHICLE(it),
                {