X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fnexball%2Fnexball.qc;h=2cad55f166da384fd9c254179b028dc5079530a6;hp=4fffabdcdedfea21dafa92f6874b0c64944fd88d;hb=3cc1e9c4a52d70b4d7097a0a584cbb391570c6e2;hpb=41caf5737d0d1c43c719672cfdd4f3816ff92765 diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc index 4fffabdcde..2cad55f166 100644 --- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc +++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc @@ -34,6 +34,7 @@ float autocvar_g_nexball_football_bouncestop; bool autocvar_g_nexball_radar_showallplayers; bool autocvar_g_nexball_sound_bounce; int autocvar_g_nexball_trail_color; +bool autocvar_g_nexball_playerclip_collisions = true; float autocvar_g_nexball_safepass_turnrate; float autocvar_g_nexball_safepass_maxdist; @@ -553,6 +554,12 @@ void SpawnBall(entity this) set_movetype(this, MOVETYPE_FLY); + if(autocvar_g_nexball_playerclip_collisions) + { + this.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID | DPCONTENTS_PLAYERCLIP; + this.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP; + } + if(!autocvar_g_nexball_sound_bounce) this.noise = ""; else if(this.noise == "")