Merge branch 'master' into Mario/minigames_merge

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / controlpoint.qc

diff --git a/qcsrc/server/controlpoint.qc b/qcsrc/server/controlpoint.qc
index ecf3feef06a85958a6f3f2423ff8f5564da4b630..7cf81d762ee0e73b8b6f018ba16825c7d51fff99 100644 (file)
--- a/qcsrc/server/controlpoint.qc
+++ b/qcsrc/server/controlpoint.qc
@@ -1,120 +1,38 @@
-#ifdef CSQC
-float controlpoint_precached;
+#include "controlpoint.qh"
 
-void controlpoint_precache()
+bool cpicon_send(entity to, int sf)
 {
-       if(controlpoint_precached)
-               return; // already precached
-               
-       precache_model("models/onslaught/controlpoint_pad.md3");
-       precache_model("models/onslaught/controlpoint_pad2.md3");
-       
-       controlpoint_precached = TRUE;
-}
-
-void controlpoint_draw()
-{
-}
-
-void controlpoint_construct()
-{
-       self.netname = "Control Point";
-
-       setorigin(self, self.origin);
-       setmodel(self, "models/onslaught/controlpoint_pad.md3");
-       setsize(self, CONTROLPOINT_MIN, CONTROLPOINT_MAX);
-       
-       self.move_movetype      = MOVETYPE_NOCLIP;
-       self.solid                      = SOLID_BBOX;
-       self.movetype           = MOVETYPE_NOCLIP; 
-       self.move_origin        = self.origin;
-       self.move_time          = time;
-       self.drawmask           = MASK_NORMAL;  
-       self.alpha                      = 1;
-       self.draw                       = controlpoint_draw;
-       self.health                     = 255;
-}
-
-.vector glowmod;
-void controlpoint_changeteam()
-{
-       if(self.team)
-       {
-               self.glowmod = Team_ColorRGB(self.team - 1);
-               self.teamradar_color = Team_ColorRGB(self.team - 1);
-               self.colormap = 1024 + (self.team - 1) * 17;
-               setmodel(self, "models/onslaught/controlpoint_pad2.md3");
-               setsize(self, CONTROLPOINT_MIN, CONTROLPOINT_MAX);
-       }
-       else
-       {
-               self.colormap = 1024;
-               self.glowmod = '1 1 0';
-               self.teamradar_color = '1 1 0';
-               setmodel(self, "models/onslaught/controlpoint_pad.md3");
-               setsize(self, CONTROLPOINT_MIN, CONTROLPOINT_MAX);
-       }
-}
-
-void ent_controlpoint()
-{
-       float sf;
-       sf = ReadByte();
-
+       WriteByte(MSG_ENTITY, ENT_CLIENT_CONTROLPOINT_ICON);
+       WriteByte(MSG_ENTITY, sf);
        if(sf & CPSF_SETUP)
        {
-               self.origin_x = ReadCoord();
-               self.origin_y = ReadCoord();
-               self.origin_z = ReadCoord();
-               setorigin(self, self.origin);
-               
-               self.team = ReadByte();
-               
-               if not(self.count)
-                       self.count = 40;
-               
-               controlpoint_changeteam();
-               controlpoint_precache();
-               controlpoint_construct();
+               WriteCoord(MSG_ENTITY, self.origin_x);
+               WriteCoord(MSG_ENTITY, self.origin_y);
+               WriteCoord(MSG_ENTITY, self.origin_z);
+
+               WriteByte(MSG_ENTITY, self.health);
+               WriteByte(MSG_ENTITY, self.max_health);
+               WriteByte(MSG_ENTITY, self.count);
+               WriteByte(MSG_ENTITY, self.team);
+               WriteByte(MSG_ENTITY, self.owner.iscaptured);
        }
 
        if(sf & CPSF_STATUS)
        {
-               float _tmp;
-               _tmp = ReadByte();
-               if(_tmp != self.team)
-               {                       
-                       self.team = _tmp;
-                       controlpoint_changeteam();
-               }
+               WriteByte(MSG_ENTITY, self.team);
+
+               if(self.health <= 0)
+                       WriteByte(MSG_ENTITY, 0);
+               else
+                       WriteByte(MSG_ENTITY, ceil((self.health / self.max_health) * 255));
        }
-}
-#endif // CSQC
 
-#ifdef SVQC
-float controlpoint_send(entity to, float sf)
-{
-       WriteByte(MSG_ENTITY, ENT_CLIENT_CONTROLPOINT);    
-       WriteByte(MSG_ENTITY, sf);
-       if(sf & CPSF_SETUP)
-       {
-           WriteCoord(MSG_ENTITY, self.origin_x);
-           WriteCoord(MSG_ENTITY, self.origin_y);
-           WriteCoord(MSG_ENTITY, self.origin_z);
-               
-               WriteByte(MSG_ENTITY, self.team);
-    }
-    
-    if(sf & CPSF_STATUS)
-    {
-               WriteByte(MSG_ENTITY, self.team);
-    }
-    
-       return TRUE;
+       return true;
 }
 
-void controlpoint_link()
+void onslaught_controlpoint_icon_link(entity e, void() spawnproc)
 {
-    Net_LinkEntity(self, TRUE, 0, controlpoint_send);
+       Net_LinkEntity(e, true, 0, cpicon_send);
+       e.think         = spawnproc;
+       e.nextthink     = time * sys_frametime;
 }
-#endif // SVQC