X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_nexball.qc;h=1b94746356c85ee15576d809f3e0ce3b57f9c076;hb=e332988cce112231a09d8c9c8c88d889a5fbea83;hp=85d0efefbc400ddfefdc580e1304332af5a52c96;hpb=20194b24b0b3a019e53ce08ed100b78f79f5652b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc
index 85d0efefb..1b9474635 100644
--- a/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@ -117,7 +117,7 @@ void GiveBall(entity plyr, entity ball)
 	ball.owner = ball.pusher = plyr; //"owner" is set to the player carrying, "pusher" to the last player who touched it
 	ball.team = plyr.team;
 	plyr.ballcarried = ball;
-	ball.dropperid = plyr.playerid;
+	ball.ctf_dropper = plyr;
 
 	plyr.effects |= autocvar_g_nexball_basketball_effects_default;
 	ball.effects &~= autocvar_g_nexball_basketball_effects_default;
@@ -287,7 +287,7 @@ void basketball_touch(void)
 		football_touch();
 		return;
 	}
-	if(!self.cnt && other.classname == "player" && (other.playerid != self.dropperid || time > self.ctf_droptime + autocvar_g_nexball_delay_collect))
+	if(!self.cnt && other.classname == "player" && (other != self.ctf_dropper || time > self.ctf_droptime + autocvar_g_nexball_delay_collect))
 	{
 		if(other.health <= 0)
 			return;
@@ -323,6 +323,8 @@ void GoalTouch(void)
 
 	if(nb_teams == 2)
 		otherteam = OtherTeam(ball.team);
+	else
+		otherteam = 0;
 
 	if((isclient = ball.pusher.flags & FL_CLIENT))
 		pname = ball.pusher.netname;
@@ -416,7 +418,7 @@ void nb_spawnteam(string teamname, float teamcolor)
 
 void nb_spawnteams(void)
 {
-	float t_r, t_b, t_y, t_p;
+	float t_r = 0, t_b = 0, t_y = 0, t_p = 0;
 	entity e;
 	for(e = world; (e = find(e, classname, "nexball_goal"));)
 	{
@@ -960,7 +962,6 @@ MUTATOR_DEFINITION(gamemode_nexball)
 
 	MUTATOR_ONADD
 	{
-	    g_nexball = 1;
 		g_nexball_meter_period = autocvar_g_nexball_meter_period;
 		if(g_nexball_meter_period <= 0)
 			g_nexball_meter_period = 2; // avoid division by zero etc. due to silly users