X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fnexball%2Fnexball.qc;h=a9bd737ca0066caff3db25d142ae2b4afa4e9a9e;hb=9e84ff8daa3826ef32e2891a7c5224a7cd436d23;hp=4fffabdcdedfea21dafa92f6874b0c64944fd88d;hpb=3bbcff2475d1b2efc1314a358bf60c6fba6e4be6;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc index 4fffabdcd..a9bd737ca 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,9 @@ void SpawnBall(entity this) set_movetype(this, MOVETYPE_FLY); + if(autocvar_g_nexball_playerclip_collisions) + this.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID | DPCONTENTS_PLAYERCLIP; + if(!autocvar_g_nexball_sound_bounce) this.noise = ""; else if(this.noise == "")