From: Mario <mario.mario@y7mail.com>
Date: Wed, 9 Oct 2013 05:56:32 +0000 (-0700)
Subject: Fix undefined null turret
X-Git-Tag: xonotic-v0.8.2~2052^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0fd4ba2d2bde6f51b3e97c7261be15e2819c8448;p=xonotic%2Fxonotic-data.pk3dir.git

Fix undefined null turret
---

diff --git a/qcsrc/common/turrets/turrets.qh b/qcsrc/common/turrets/turrets.qh
index 9f90d3e520..5491746e9c 100644
--- a/qcsrc/common/turrets/turrets.qh
+++ b/qcsrc/common/turrets/turrets.qh
@@ -150,7 +150,7 @@ const float TNSF_FULL_UPDATE  = 16777215;
 //  Turret Registration
 // =====================
 
-float m_null(float dummy);
+float t_null(float dummy);
 void register_turret(float id, float(float) func, float turretflags, vector min_s, vector max_s, string modelname, string headmodelname, string shortname, string mname);
 void register_turrets_done();
 
@@ -171,7 +171,7 @@ float TUR_LAST;
 	ACCUMULATE_FUNCTION(RegisterTurrets, RegisterTurrets_##id)
 #ifdef MENUQC
 #define REGISTER_TURRET(id,func,turretflags,min_s,max_s,modelname,headmodelname,shortname,mname) \
-	REGISTER_TURRET_2(TUR_##id,m_null,turretflags,min_s,max_s,modelname,headmodelname,shortname,mname)
+	REGISTER_TURRET_2(TUR_##id,t_null,turretflags,min_s,max_s,modelname,headmodelname,shortname,mname)
 #else
 #define REGISTER_TURRET(id,func,turretflags,min_s,max_s,modelname,headmodelname,shortname,mname) \
 	REGISTER_TURRET_2(TUR_##id,func,turretflags,min_s,max_s,modelname,headmodelname,shortname,mname)