Merge branch 'bones_was_here/q1bsp_hitbox' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / client.qc

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 1d62feffa2858ea3bbc689fa8da8b1059f3a215a..e66f270cbf0b78af07db0e597322c754bc2c1043 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -643,8 +643,9 @@ void PutPlayerInServer(entity this)
        this.respawn_flags = 0;
        this.respawn_time = 0;
        STAT(RESPAWN_TIME, this) = 0;
-       // DP model scaling uses 1/16 accuracy and 13/16 is closest to 56/69
-       this.scale = ((q3compat && autocvar_sv_q3compat_changehitbox) ? 0.8125 : autocvar_sv_player_scale);
+       this.scale = ((q3compat && autocvar_sv_q3compat_changehitbox) || !autocvar_sv_mapformat_is_quake3)
+               ? 0.8125 // DP model scaling uses 1/16 accuracy and 13/16 is closest to 56/69
+               : autocvar_sv_player_scale;
        this.fade_time = 0;
        this.pain_finished = 0;
        this.pushltime = 0;