X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnades.qh;h=9ec6c291451c20a80d683138178121afbbac88c0;hb=048eec2a1ac0b11c0e6387f7dbc17d15f5e6fb07;hp=50f2e57e8067c212e34239305d6e513fa7ec685b;hpb=51c7e0a875a0a15201f57787071a21d327d1bb26;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/nades.qh b/qcsrc/common/nades.qh
index 50f2e57e8..9ec6c2914 100644
--- a/qcsrc/common/nades.qh
+++ b/qcsrc/common/nades.qh
@@ -1,8 +1,6 @@
 #ifndef NADES_H
 #define NADES_H
 
-#include "oo.qh"
-#include "registry.qh"
 #include "teams.qh"
 
 .float healer_lifetime;
@@ -42,7 +40,7 @@ CLASS(Nade, Object)
     }
 ENDCLASS(Nade)
 
-REGISTER_NADE(NULL);
+REGISTER_NADE(Null);
 
 #define NADE_PROJECTILE(i, projectile, trail) do { \
     this.m_projectile[i] = projectile; \
@@ -111,7 +109,7 @@ entity Nade_FromProjectile(float proj)
             if (it.m_projectile[j] == proj) return it;
         }
     ));
-    return NADE_TYPE_NULL;
+    return NADE_TYPE_Null;
 }
 
 string Nade_TrailEffect(float proj, float nade_team)