]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Multijump: fix 262/head
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 29 Nov 2015 04:19:35 +0000 (15:19 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 29 Nov 2015 04:19:35 +0000 (15:19 +1100)
qcsrc/common/mutators/mutator/multijump/multijump.qc
qcsrc/common/stats.qh
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/gamemode_tdm.qc

index 68ccecaab499e4a1bd02fd68a82abb680f2f1785..7a8b2921880046ee077639b023b69f75bee50322 100644 (file)
@@ -6,13 +6,7 @@
 
 
 #if defined(SVQC)
-REGISTER_MUTATOR(multijump, cvar("g_multijump"))
-{
-       MUTATOR_ONADD
-       {
-               addstat(STAT_MULTIJUMP_COUNT.m_id, AS_INT, multijump_count);
-       }
-}
+REGISTER_MUTATOR(multijump, cvar("g_multijump"));
 #elif defined(CSQC)
 REGISTER_MUTATOR(multijump, true);
 #endif
index d8a211745935001e2bd675fbad0bb500bd609819..81da6e23de73e544b32c3f02ebda1b887833c164 100644 (file)
@@ -100,7 +100,8 @@ REGISTER_STAT(MULTIJUMP_DODGING, int, autocvar_g_multijump_dodging)
 REGISTER_STAT(MULTIJUMP_MAXSPEED, float, autocvar_g_multijump_maxspeed)
 REGISTER_STAT(MULTIJUMP_ADD, int, autocvar_g_multijump_add)
 REGISTER_STAT(MULTIJUMP_SPEED, float, autocvar_g_multijump_speed)
-REGISTER_STAT(MULTIJUMP_COUNT, int /*doesn't matter*/)
+.int multijump_count;
+REGISTER_STAT(MULTIJUMP_COUNT, int, this.multijump_count)
 REGISTER_STAT(MULTIJUMP, int, autocvar_g_multijump)
 REGISTER_STAT(DOUBLEJUMP, int, autocvar_sv_doublejump)
 
index 2e71383d7bb57c79e98de0a47892f1a290139856..432c32de710dead3ac8d9c185c2f05aa3a0c50c3 100644 (file)
@@ -2759,7 +2759,7 @@ void ctf_DelayedInit() // Do this check with a delay so we can wait for teams to
        // if no teams are found, spawn defaults
        if(find(world, classname, "ctf_team") == world)
        {
-               LOG_INFO("No ""ctf_team"" entities found on this map, creating them anyway.\n");
+               LOG_INFO("No \"ctf_team\" entities found on this map, creating them anyway.\n");
                ctf_SpawnTeam("Red", NUM_TEAM_1 - 1);
                ctf_SpawnTeam("Blue", NUM_TEAM_2 - 1);
                if(ctf_teams >= 3)
index 42415a495e7140dbab08c4e9a47c925f51be4022..5da71b8177bd303715397d6d73a0f9a614487b4e 100644 (file)
@@ -71,7 +71,7 @@ void tdm_DelayedInit()
        // if no teams are found, spawn defaults
        if(find(world, classname, "tdm_team") == world)
        {
-               LOG_INFO("No ""tdm_team"" entities found on this map, creating them anyway.\n");
+               LOG_INFO("No \"tdm_team\" entities found on this map, creating them anyway.\n");
 
                int numteams = min(4, autocvar_g_tdm_teams_override);