X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_tuba.qc;h=46197204026359c0de9a914c109e63da86d15779;hb=43528747368b3c2395edc28dc9298059a5542e40;hp=4a7978808319109c2d2de1f7f61d652b512e168a;hpb=725a914113fa32f1f9d99fc3becf527f9d13c99c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 4a7978808..461972040 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -48,7 +48,7 @@ float Tuba_GetNote(entity pl, float hittype)
 	// kind of tuba currently is player slot number, or team number if in
 	// teamplay
 	// that way, holes in the range of notes are "plugged"
-	if(teams_matter)
+	if(teamplay)
 	{
 		if(pl.team == COLOR_TEAM2 || pl.team == COLOR_TEAM4)
 			note += 3;
@@ -83,7 +83,7 @@ float W_Tuba_NoteSendEntity(entity to, float sf)
 		WriteCoord(MSG_ENTITY, self.origin_x);
 		WriteCoord(MSG_ENTITY, self.origin_y);
 		WriteCoord(MSG_ENTITY, self.origin_z);
-		WriteByte(MSG_ENTITY, self.owner != to);
+		WriteByte(MSG_ENTITY, self.realowner != to);
 	}
 	return TRUE;
 }
@@ -97,30 +97,30 @@ void W_Tuba_NoteThink()
 	entity e;
 	if(time > self.teleport_time)
 	{
-		self.owner.tuba_note = world;
+		self.realowner.tuba_note = world;
 		remove(self);
 		return;
 	}
 	self.nextthink = time;
 	dist_mult = autocvar_g_balance_tuba_attenuation / autocvar_snd_soundradius;
 	FOR_EACH_REALCLIENT(e)
-	if(e != self.owner)
+	if(e != self.realowner)
 	{
 		v = self.origin - (e.origin + e.view_ofs);
 		vol0 = max(0, 1 - vlen(v) * dist_mult);
 		dir0 = normalize(v);
-		v = self.owner.origin - (e.origin + e.view_ofs);
+		v = self.realowner.origin - (e.origin + e.view_ofs);
 		vol1 = max(0, 1 - vlen(v) * dist_mult);
 		dir1 = normalize(v);
 		if(fabs(vol0 - vol1) > 0.005) // 0.5 percent change in volume
 		{
-			setorigin(self, self.owner.origin);
+			setorigin(self, self.realowner.origin);
 			self.SendFlags |= 1;
 			break;
 		}
 		if(dir0 * dir1 < 0.9994) // 2 degrees change in angle
 		{
-			setorigin(self, self.owner.origin);
+			setorigin(self, self.realowner.origin);
 			self.SendFlags |= 1;
 			break;
 		}
@@ -161,7 +161,7 @@ void W_Tuba_Attack(float hittype)
 	if not(self.tuba_note)
 	{
 		self.tuba_note = spawn();
-		self.tuba_note.owner = self;
+		self.tuba_note.owner = self.tuba_note.realowner = self;
 		self.tuba_note.cnt = n;
 		self.tuba_note.think = W_Tuba_NoteThink;
 		self.tuba_note.nextthink = time;