X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_random_gravity.qc;h=27fcbf99e2b6e68374dc476060d5b99de66542a3;hb=6f37a8f8076a572097afb13de2c367a72717c927;hp=e2832ace2dc2f61824ec10dc9df76e16922b0250;hpb=6ea5f1a79adeb12782110c6fbbbbef4b81a52a13;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/mutator_random_gravity.qc b/qcsrc/server/mutators/mutator_random_gravity.qc index e2832ace2..27fcbf99e 100644 --- a/qcsrc/server/mutators/mutator_random_gravity.qc +++ b/qcsrc/server/mutators/mutator_random_gravity.qc @@ -1,3 +1,7 @@ +#include "../_.qh" + +#include "mutator.qh" + // Random Gravity // // Mutator by Mario @@ -7,21 +11,21 @@ float gravity_delay; MUTATOR_HOOKFUNCTION(gravity_StartFrame) { - if(gameover || !cvar("g_random_gravity")) return FALSE; - if(time < gravity_delay) return FALSE; - if(time < game_starttime) return FALSE; - if(round_handler_IsActive() && !round_handler_IsRoundStarted()) return FALSE; - - if(random() >= autocvar_g_random_gravity_negative_chance) + if(gameover || !cvar("g_random_gravity")) return false; + if(time < gravity_delay) return false; + if(time < game_starttime) return false; + if(round_handler_IsActive() && !round_handler_IsRoundStarted()) return false; + + if(random() >= autocvar_g_random_gravity_negative_chance) cvar_set("sv_gravity", ftos(bound(autocvar_g_random_gravity_min, random() - random() * -autocvar_g_random_gravity_negative, autocvar_g_random_gravity_max))); else cvar_set("sv_gravity", ftos(bound(autocvar_g_random_gravity_min, random() * autocvar_g_random_gravity_positive, autocvar_g_random_gravity_max))); - + gravity_delay = time + autocvar_g_random_gravity_delay; - + dprint("Gravity is now: ", ftos(autocvar_sv_gravity), "\n"); - - return FALSE; + + return false; } MUTATOR_HOOKFUNCTION(gravity_BuildMutatorsString) @@ -41,11 +45,11 @@ MUTATOR_DEFINITION(mutator_random_gravity) MUTATOR_HOOK(SV_StartFrame, gravity_StartFrame, CBC_ORDER_ANY); MUTATOR_HOOK(BuildMutatorsString, gravity_BuildMutatorsString, CBC_ORDER_ANY); MUTATOR_HOOK(BuildMutatorsPrettyString, gravity_BuildMutatorsPrettyString, CBC_ORDER_ANY); - + MUTATOR_ONADD { cvar_settemp("sv_gravity", cvar_string("sv_gravity")); // settemp current gravity so it's restored on match end } - return FALSE; + return false; }