X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_tuba.qc;h=999749b3e01d16783fc46c59ccec45fe59461d9e;hb=fcbf9538330960b989dbe84e7188349d7e8b109f;hp=32a796075dfbec4076a0e476b47a9787749a8c36;hpb=b89fa48bf6faceabab9ee7ab86e614d8045b2186;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 32a796075..999749b3e 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -94,8 +94,6 @@ float W_Tuba_HasPlayed(entity pl, string melody, float instrument, float ignorep
 			}
 		}
 
-		//print(ftos(mmin), " ... ", ftos(mmax), "\n");
-
 		if(mmin > mmax) // rhythm fail
 			return FALSE;
 	}
@@ -127,10 +125,13 @@ void W_Tuba_NoteOff()
 			{
 				default:
 				case 0: // Tuba
-					bprint(strcat("\{1}\{13}* ^3", self.owner.netname, "^3 played on the @!#%%'n Tuba: ^7", s, "\n"));
+					bprint(strcat("\{1}\{13}* ^3", self.owner.netname, "^3 played on the @!#%'n Tuba: ^7", s, "\n"));
 					break;
 				case 1:
-					bprint(strcat("\{1}\{13}* ^3", self.owner.netname, "^3 played on the @!#%%'n Accordeon: ^7", s, "\n"));
+					bprint(strcat("\{1}\{13}* ^3", self.owner.netname, "^3 played on the @!#%'n Accordeon: ^7", s, "\n"));
+					break;
+				case 2:
+					bprint(strcat("\{1}\{13}* ^3", self.owner.netname, "^3 played on the @!#%'n Klein Bottle: ^7", s, "\n"));
 					break;
 			}
 		}
@@ -162,6 +163,7 @@ float Tuba_GetNote(entity pl, float hittype)
 		case 2: note = -5; break; // G
 		case 3: note = -4; break; // G#
 		case 4: note = +5; break; // e#
+		default:
 		case 5: note =  0; break; // c
 		case 6: note = +2; break; // d
 		case 7: note = +3; break; // eb
@@ -375,9 +377,10 @@ float w_tuba(float req)
 		precache_model ("models/weapons/g_tuba.md3");
 		precache_model ("models/weapons/v_tuba.md3");
 		precache_model ("models/weapons/h_tuba.iqm");
-		precache_model ("models/weapons/g_akordeon.md3");
 		precache_model ("models/weapons/v_akordeon.md3");
 		precache_model ("models/weapons/h_akordeon.iqm");
+		precache_model ("models/weapons/v_kleinbottle.md3");
+		precache_model ("models/weapons/h_kleinbottle.iqm");
 
 		//float i;
 		//for(i = -18; i <= +27; ++i)
@@ -401,6 +404,10 @@ float w_tuba(float req)
 					self.weaponname = "akordeon";
 					break;
 				case 1:
+					self.tuba_instrument = 2;
+					self.weaponname = "kleinbottle";
+					break;
+				case 2:
 					self.tuba_instrument = 0;
 					self.weaponname = "tuba";
 					break;
@@ -448,6 +455,9 @@ float w_tuba(float req)
 			case 1: // Accordeon
 				w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Accordeon");
 				break;
+			case 2: // Klein Bottle
+				w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Klein Bottle");
+				break;
 		}
 	}
 	else if (req == WR_KILLMESSAGE)
@@ -469,6 +479,9 @@ float w_tuba(float req)
 			case 1: // Accordeon
 				w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Accordeon");
 				break;
+			case 2: // Klein Bottle
+				w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Klein Bottle");
+				break;
 		}
 	}
 	return TRUE;