Merge branch 'master' into terencehill/hud_fixes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qh

diff --git a/qcsrc/server/cl_client.qh b/qcsrc/server/cl_client.qh
index 36f33219c6d9f4cc871470a2c9122a7fbf9ca295..337c4db838c3e73ed0b95b60fd58658d22315cb2 100644 (file)
--- a/qcsrc/server/cl_client.qh
+++ b/qcsrc/server/cl_client.qh
@@ -28,19 +28,30 @@ CLASS(Client, Object)
 
     // custom
 
-    ATTRIB(Client, flags, int, this.flags)
     ATTRIB(Client, playerid, int, this.playerid)
 
     METHOD(Client, m_unwind, bool(Client this));
 
+    STATIC_METHOD(Client, Add, void(Client this, int _team));
+    STATIC_METHOD(Client, Remove, void(Client this));
+
     INIT(Client) {
         if (this.m_unwind(this)) return this;
+        make_impure(this);
         this.classname = "player_joining";
-        this.flags = FL_CLIENT;
         static int playerid_last;
         this.playerid = ++playerid_last;
         ClientState_attach(this);
     }
+    DESTRUCTOR(Client) {
+        Client_Remove(this);
+    }
+    CONSTRUCTOR(Client, string name) {
+        CONSTRUCT(Client);
+        this.netname = name;
+        this.netaddress = "local";
+        this.playermodel = "models/player/megaerebus.iqm";
+    }
 ENDCLASS(Client)
 
 CLASS(Observer, Client)