X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_tuba.qc;h=686c89ec3a7f6f0dae6a0fe3ed8c0761735b6555;hb=75d8c631b71daf6ad2019d8139771f00ad426d33;hp=86fcca34681630d81b4b3da73a9a402e79674e0a;hpb=221325d0a55851348e3397354225f04cd472d42f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc
index 86fcca346..686c89ec3 100644
--- a/qcsrc/common/weapons/w_tuba.qc
+++ b/qcsrc/common/weapons/w_tuba.qc
@@ -363,7 +363,7 @@ void W_Tuba_NoteOn(float hittype)
 	o = gettaginfo(self.exteriorweaponentity, 0);
 	if(time > self.tuba_smoketime)
 	{
-		Send_Effect("smoke_ring", o + v_up * 45 + v_right * -6 + v_forward * 8, v_up * 100, 1);
+		Send_Effect(EFFECT_SMOKE_RING, o + v_up * 45 + v_right * -6 + v_forward * 8, v_up * 100, 1);
 		self.tuba_smoketime = time + 0.25;
 	}
 }
@@ -417,13 +417,13 @@ bool W_Tuba(int req)
 		}
 		case WR_INIT:
 		{
-			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/v_akordeon.md3");
-			precache_model("models/weapons/h_akordeon.iqm");
-			precache_model("models/weapons/v_kleinbottle.md3");
-			precache_model("models/weapons/h_kleinbottle.iqm");
+			precache_model(W_Model("g_tuba.md3"));
+			precache_model(W_Model("v_tuba.md3"));
+			precache_model(W_Model("h_tuba.iqm"));
+			precache_model(W_Model("v_akordeon.md3"));
+			precache_model(W_Model("h_akordeon.iqm"));
+			precache_model(W_Model("v_kleinbottle.md3"));
+			precache_model(W_Model("h_kleinbottle.iqm"));
 			TUBA_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
 			return true;
 		}
@@ -454,7 +454,7 @@ bool W_Tuba(int req)
 						break;
 				}
 				W_SetupShot(self, false, 0, "", 0, 0);
-				Send_Effect("teleport", w_shotorg, '0 0 0', 1);
+				Send_Effect(EFFECT_TELEPORT, w_shotorg, '0 0 0', 1);
 				self.weaponentity.state = WS_INUSE;
 				weapon_thinkf(WFRAME_RELOAD, 0.5, w_ready);
 			}