X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fturret.qh;h=151797b6d891c3360ef1d861048c11f85b1da9a1;hb=17308b9ad60c2f773be0de39b811a9752e3037af;hp=8862f47d7763ce8640192bee5048fadd9fb048d7;hpb=7bd8f8562a392fda3ac881b1fbe2a35a5ef0f5c8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/turrets/turret.qh b/qcsrc/common/turrets/turret.qh
index 8862f47d7..151797b6d 100644
--- a/qcsrc/common/turrets/turret.qh
+++ b/qcsrc/common/turrets/turret.qh
@@ -1,7 +1,7 @@
 #ifndef TURRET_H
 #define TURRET_H
 
-#include "../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 CLASS(Turret, Object)
     ATTRIB(Turret, m_id, int, 0)
@@ -23,7 +23,7 @@ CLASS(Turret, Object)
     /** turret hitbox size */
     ATTRIB(Turret, maxs, vector, '0 0 0')
 
-    METHOD(Turret, display, void(entity this, void(string name, string icon) returns)) {
+    METHOD(Turret, display, void(Turret this, void(string name, string icon) returns)) {
         returns(this.turret_name, string_null);
     }
     /** (BOTH) setup turret data */
@@ -31,7 +31,7 @@ CLASS(Turret, Object)
 
     }
     /** (SERVER) logic to run every frame */
-    METHOD(Turret, tr_think, void(Turret this)) {
+    METHOD(Turret, tr_think, void(Turret this, entity it)) {
 
     }
     /** (SERVER) called when turret dies */
@@ -43,11 +43,14 @@ CLASS(Turret, Object)
 
     }
     ATTRIB(Turret, m_weapon, Weapon, WEP_Null)
+#ifdef SVQC
     /** (SERVER) called when turret attacks */
-    METHOD(Turret, tr_attack, void(Turret this)) {
+    METHOD(Turret, tr_attack, void(Turret this, entity it)) {
         Weapon w = this.m_weapon;
-        w.wr_think(w, self, true, false);
+        .entity weaponentity = weaponentities[0];
+        w.wr_think(w, this, weaponentity, 1);
     }
+#endif
     /** (ALL) */
     METHOD(Turret, tr_config, void(Turret this)) {
         // TODO