X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_tuba.qc;h=3c40519d6330b06d7b8cdfb4719f0884c7a69828;hb=e42210add9b5b8b80d134b76ce167bf32b5cc081;hp=6806bf133bafa8cb7864d745923615191ceeb52c;hpb=845401fd312c66c059aaee1772ac5d79555ab4fc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc
index 6806bf133..3c40519d6 100644
--- a/qcsrc/common/weapons/w_tuba.qc
+++ b/qcsrc/common/weapons/w_tuba.qc
@@ -55,7 +55,7 @@ float W_Tuba_MarkClientOnlyFieldsAsUsed() {
 #ifdef SVQC
 void spawnfunc_weapon_tuba(void) { weapon_defaultspawnfunc(WEP_TUBA); }
 
-float W_Tuba_HasPlayed(entity pl, string melody, float instrument, float ignorepitch, float mintempo, float maxtempo)
+bool W_Tuba_HasPlayed(entity pl, string melody, int instrument, bool ignorepitch, float mintempo, float maxtempo)
 {
 	float i, j, mmin, mmax, nolength;
 	float n = tokenize_console(melody);
@@ -182,7 +182,7 @@ void W_Tuba_NoteOff(void)
 	remove(self);
 }
 
-float W_Tuba_GetNote(entity pl, float hittype)
+int W_Tuba_GetNote(entity pl, int hittype)
 {
 	float movestate = 5;
 	if (pl.movement.x < 0)		movestate -= 3;
@@ -190,7 +190,7 @@ float W_Tuba_GetNote(entity pl, float hittype)
 	if (pl.movement.y < 0)		movestate -= 1;
 	else if (pl.movement.y > 0)	movestate += 1;
 
-	float note = 0;
+	int note = 0;
 	switch(movestate)
 	{
 	// layout: originally I wanted
@@ -250,9 +250,9 @@ float W_Tuba_GetNote(entity pl, float hittype)
 	return note;
 }
 
-float W_Tuba_NoteSendEntity(entity to, float sf)
+bool W_Tuba_NoteSendEntity(entity to, int sf)
 {
-	float f;
+	int f;
 
 	msg_entity = to;
 	if(!sound_allowed(MSG_ONE, self.realowner))
@@ -367,7 +367,7 @@ void W_Tuba_NoteOn(float hittype)
 	}
 }
 
-float W_Tuba(float req)
+bool W_Tuba(int req)
 {
 	switch(req)
 	{
@@ -382,7 +382,7 @@ float W_Tuba(float req)
 				else
 					self.BUTTON_ATCK2 = 1;
 			}
-			
+
 			return true;
 		}
 		case WR_THINK:
@@ -411,7 +411,7 @@ float W_Tuba(float req)
 					self = oldself;
 				}
 			}
-			
+
 			return true;
 		}
 		case WR_INIT:
@@ -423,7 +423,7 @@ float W_Tuba(float req)
 			precache_model("models/weapons/h_akordeon.iqm");
 			precache_model("models/weapons/v_kleinbottle.md3");
 			precache_model("models/weapons/h_kleinbottle.iqm");
-			TUBA_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+			TUBA_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
 			return true;
 		}
 		case WR_SETUP:
@@ -457,7 +457,7 @@ float W_Tuba(float req)
 				self.weaponentity.state = WS_INUSE;
 				weapon_thinkf(WFRAME_RELOAD, 0.5, w_ready);
 			}
-			
+
 			return true;
 		}
 		case WR_CHECKAMMO1:
@@ -467,7 +467,7 @@ float W_Tuba(float req)
 		}
 		case WR_CONFIG:
 		{
-			TUBA_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+			TUBA_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
 			return true;
 		}
 		case WR_SUICIDEMESSAGE:
@@ -493,7 +493,7 @@ float W_Tuba(float req)
 }
 #endif
 #ifdef CSQC
-float W_Tuba(float req)
+bool W_Tuba(int req)
 {
 	// nothing to do here; particles of tuba are handled differently
 	// WEAPONTODO