- read g_dodging cvar into g_dodging float

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index e80025a676e30e27fe43b44838d40b0fabec59d8..f18c610aa84cefc431f77b9b2150467f2d98aa7a 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -17,7 +17,7 @@ float require_spawnfunc_prefix; // if this float exists, only functions with spa
 
 float ctf_score_value(string parameter);
 
-float g_dm, g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_ca, g_lms, g_runematch, g_race, g_nexball, g_cts;
+float g_dm, g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_ca, g_lms, g_runematch, g_race, g_nexball, g_cts, g_dodging;
 float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_laserguided_missile, g_midair, g_minstagib, g_pinata, g_norecoil, g_vampire, g_minstagib_invis_alpha, g_bloodloss;
 float g_warmup_limit;
 float g_warmup_allguns;

diff --git a/qcsrc/server/mutators/mutator_dodging.qc b/qcsrc/server/mutators/mutator_dodging.qc
index bf1284c67bf0d5c184af19354db02cd17c471d5f..f87662e4d099693b68e2a1e1b87d31fbc70bd976 100644 (file)
--- a/qcsrc/server/mutators/mutator_dodging.qc
+++ b/qcsrc/server/mutators/mutator_dodging.qc
@@ -12,6 +12,7 @@ void dodging_Initialize() {
 
 MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
        print("dodging_hook\n");
+       print(ftos(g_dodging), "\n");
        return 0;
 }
 
@@ -19,7 +20,7 @@ MUTATOR_DEFINITION(dodging)
 {
        // we need to be called before GetPressedKey does its thing so we can
        // detect state changes..
-       MUTATOR_HOOK(GetPressedKeys, dodging_GetPressedKeys, CBC_ORDER_FIRST);
+       MUTATOR_HOOK(GetPressedKeys, dodging_GetPressedKeys, CBC_ORDER_ANY);
 
        // this just turns on the cvar. TODO: implement :D
        MUTATOR_ONADD

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 4e1c16728c36cad00c6da719f7279f962e337976..b251869984c2b4de12ca36402775fa515dcc3eae 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -208,6 +208,10 @@ void InitGameplayMode()
        fraglimit_override = cvar("fraglimit_override");
        leadlimit_override = cvar("leadlimit_override");
 
+       g_dodging = cvar("g_dodging");
+       if(g_dodging)
+               MUTATOR_ADD(dodging);
+       
        if(g_dm)
        {
                game = GAME_DEATHMATCH;