Merge branch 'master' into Mario/bulldozer

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / warpzone / client.qc

diff --git a/qcsrc/lib/warpzone/client.qc b/qcsrc/lib/warpzone/client.qc
index 49216057c447f115009ddc82c2f13da67cb3ee40..dd2b5cc9a115b2d606e5dfffc05480ac31940d7d 100644 (file)
--- a/qcsrc/lib/warpzone/client.qc
+++ b/qcsrc/lib/warpzone/client.qc
@@ -25,8 +25,8 @@ void WarpZone_Fade_PreDraw()
                self.drawmask = MASK_NORMAL;
 }
 
-void WarpZone_Read(float isnew)
-{SELFPARAM();
+NET_HANDLE(ENT_CLIENT_WARPZONE, bool isnew)
+{
        warpzone_warpzones_exist = 1;
        if (!self.enemy)
        {
@@ -87,10 +87,11 @@ void WarpZone_Read(float isnew)
        // how to draw
        // engine currently wants this
        self.predraw = WarpZone_Fade_PreDraw;
+       return true;
 }
 
-void WarpZone_Camera_Read(float isnew)
-{SELFPARAM();
+NET_HANDLE(ENT_CLIENT_WARPZONE_CAMERA, bool isnew)
+{
        warpzone_cameras_exist = 1;
        self.classname = "func_warpzone_camera";
 
@@ -143,18 +144,19 @@ void WarpZone_Camera_Read(float isnew)
        // how to draw
        // engine currently wants this
        self.predraw = WarpZone_Fade_PreDraw;
+       return true;
 }
 
 void CL_RotateMoves(vector ang) = #638;
-void WarpZone_Teleported_Read(float isnew)
-{SELFPARAM();
+NET_HANDLE(ENT_CLIENT_WARPZONE_TELEPORTED, bool isnew)
+{
        self.classname = "warpzone_teleported";
        vector v;
        v.x = ReadCoord();
        v.y = ReadCoord();
        v.z = ReadCoord();
-       if(!isnew)
-               return;
+       return = true;
+       if (!isnew) return;
        self.warpzone_transform = v;
        setproperty(VF_CL_VIEWANGLES, WarpZone_TransformVAngles(self, getpropertyvec(VF_CL_VIEWANGLES)));
        if(checkextension("DP_CSQC_ROTATEMOVES"))
@@ -278,10 +280,6 @@ void WarpZone_FixView()
                setproperty(VF_ORIGIN, org + o);
 }
 
-void WarpZone_Init()
-{
-}
-
 void WarpZone_Shutdown()
 {
        WarpZone_View_Outside();