X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fnexball%2Fnexball.qc;fp=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fnexball%2Fnexball.qc;h=f4fcc8e1b8c706250b0eca1014fa9ec61cb94239;hb=bcfb2c28a83d43a76cdc18de1f00b4d191da55e5;hp=7eb8ecb4b0bd62a30004870d7c4a869ec87b85da;hpb=0df9efc608a567dcbff2f81680174626a43e78aa;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 7eb8ecb4b..f4fcc8e1b 100644
--- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
@@ -13,8 +13,6 @@ MUTATOR_HOOKFUNCTION(cl_nb, WantEventchase)
 }
 #endif
 #ifdef SVQC
-.float metertime = _STAT(NB_METERSTART);
-
 .entity ballcarried;
 
 int autocvar_g_nexball_goalleadlimit;
@@ -154,9 +152,9 @@ void GiveBall(entity plyr, entity ball)
 		ownr.effects &= ~autocvar_g_nexball_basketball_effects_default;
 		ownr.ballcarried = NULL;
 		GameRules_scoring_vip(ownr, false);
-		if(ownr.metertime)
+		if(STAT(NB_METERSTART, ownr))
 		{
-			ownr.metertime = 0;
+			STAT(NB_METERSTART, ownr) = 0;
 			ownr.(weaponentity).state = WS_READY;
 		}
 		WaypointSprite_Kill(ownr.waypointsprite_attachedforcarrier);
@@ -223,9 +221,9 @@ void DropBall(entity ball, vector org, vector vel)
 	setthink(ball, ResetBall);
 	ball.nextthink = min(time + autocvar_g_nexball_delay_idle, ball.teamtime);
 
-	if(ball.owner.metertime)
+	if(STAT(NB_METERSTART, ball.owner))
 	{
-		ball.owner.metertime = 0;
+		STAT(NB_METERSTART, ball.owner) = 0;
 		.entity weaponentity = ball.weaponentity_fld;
 		ball.owner.(weaponentity).state = WS_READY;
 	}
@@ -853,14 +851,14 @@ MUTATOR_HOOKFUNCTION(nb, SpectateCopy)
 	entity spectatee = M_ARGV(0, entity);
 	entity client = M_ARGV(1, entity);
 
-	client.metertime = spectatee.metertime;
+	STAT(NB_METERSTART, client) = STAT(NB_METERSTART, spectatee);
 }
 
 MUTATOR_HOOKFUNCTION(nb, PlayerSpawn)
 {
 	entity player = M_ARGV(0, entity);
 
-	player.metertime = 0;
+	STAT(NB_METERSTART, player) = 0;
 	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 	{
 		.entity weaponentity = weaponentities[slot];