X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fwarpzonelib%2Fserver.qc;h=bd6266ea0ca008f8141244638a2bd1ee4b6043e5;hb=fbb96108e5828a7557694db4469c2d0d7c582846;hp=c4dc7287f1c182e79ac96e009a8000902678043c;hpb=e7f4a20c1ea72fa73d07c1c95ec4fb2f6cee900c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc index c4dc7287f..bd6266ea0 100644 --- a/qcsrc/warpzonelib/server.qc +++ b/qcsrc/warpzonelib/server.qc @@ -1,15 +1,16 @@ +#include "server.qh" + +#include "common.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../dpdefs/progsdefs.qh" - #include "../dpdefs/dpextensions.qh" - #include "common.qh" - #include "server.qh" #include "../common/constants.qh" #include "../common/util.qh" + #include "../dpdefs/dpextensions.qh" + #include "../dpdefs/progsdefs.qh" + #include "../server/command/common.qh" #include "../server/constants.qh" #include "../server/defs.qh" - #include "../server/command/common.qh" #endif #ifdef WARPZONELIB_KEEPDEBUG @@ -51,7 +52,7 @@ void WarpZone_TeleportPlayer(entity teleporter, entity player, vector to, vector WarpZone_PostTeleportPlayer_Callback(player); } -float WarpZone_Teleported_Send(entity to, float sf) +bool WarpZone_Teleported_Send(entity to, int sf) { WriteByte(MSG_ENTITY, ENT_CLIENT_WARPZONE_TELEPORTED); WriteCoord(MSG_ENTITY, self.angles.x); @@ -216,7 +217,7 @@ void WarpZone_Touch (void) } } -float WarpZone_Send(entity to, float sendflags) +bool WarpZone_Send(entity to, int sendflags) { WriteByte(MSG_ENTITY, ENT_CLIENT_WARPZONE); @@ -270,7 +271,7 @@ float WarpZone_Send(entity to, float sendflags) return true; } -float WarpZone_Camera_Send(entity to, float sendflags) +bool WarpZone_Camera_Send(entity to, int sendflags) { int f = 0; WriteByte(MSG_ENTITY, ENT_CLIENT_WARPZONE_CAMERA);