X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Ftuba.qc;h=05787ba58777650a2522782586f6900e7df64fa3;hb=3a035cb2732af064519135410c5664c2e1b3f501;hp=9baa0c61555b5a16f5eee43fc64a677359ec24da;hpb=5b22584122d4354ab7819853d0fa5219d14d832e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc
index 9baa0c615..05787ba58 100644
--- a/qcsrc/common/weapons/weapon/tuba.qc
+++ b/qcsrc/common/weapons/weapon/tuba.qc
@@ -336,10 +336,8 @@ void W_Tuba_NoteOn(float hittype)
 	{
 		if(self.tuba_note.cnt != n || self.tuba_note.tuba_instrument != self.tuba_instrument)
 		{
-			entity oldself = self;
-			self = self.tuba_note;
-			W_Tuba_NoteOff();
-			self = oldself;
+			SELFCALL(self.tuba_note, W_Tuba_NoteOff());
+			SELFCALL_DONE();
 		}
 	}
 
@@ -406,10 +404,8 @@ bool W_Tuba(int req)
 			{
 				if(!self.BUTTON_ATCK && !self.BUTTON_ATCK2)
 				{
-					entity oldself = self;
-					self = self.tuba_note;
-					W_Tuba_NoteOff();
-					self = oldself;
+					SELFCALL(self.tuba_note, W_Tuba_NoteOff());
+					SELFCALL_DONE();
 				}
 			}