From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 29 Nov 2015 04:19:35 +0000 (+1100)
Subject: Multijump: fix
X-Git-Tag: xonotic-v0.8.2~1609^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a1c58a61c6e9892cae823f55fec21ee390df6106;p=xonotic%2Fxonotic-data.pk3dir.git

Multijump: fix
---

diff --git a/qcsrc/common/mutators/mutator/multijump/multijump.qc b/qcsrc/common/mutators/mutator/multijump/multijump.qc
index 68ccecaab..7a8b29218 100644
--- a/qcsrc/common/mutators/mutator/multijump/multijump.qc
+++ b/qcsrc/common/mutators/mutator/multijump/multijump.qc
@@ -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
diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh
index d8a211745..81da6e23d 100644
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -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)
 
diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
index 2e71383d7..432c32de7 100644
--- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
@@ -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)
diff --git a/qcsrc/server/mutators/mutator/gamemode_tdm.qc b/qcsrc/server/mutators/mutator/gamemode_tdm.qc
index 42415a495..5da71b817 100644
--- a/qcsrc/server/mutators/mutator/gamemode_tdm.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_tdm.qc
@@ -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);