Even more floats to bool/int

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

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 511db81c713b80258f1f281d81f10d0484613cd6..91add1a405b8517a7c61bd05133cdbc085ac25d3 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -1,4 +1,21 @@
-float SpawnPoint_Send(entity to, float sf)
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qh"
+    #include "../dpdefs/dpextensions.qh"
+    #include "../warpzonelib/util_server.qh"
+    #include "../common/constants.qh"
+    #include "../common/teams.qh"
+    #include "../common/util.qh"
+    #include "autocvars.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "mutators/mutators_include.qh"
+    #include "spawnpoints.qh"
+    #include "race.qh"
+#endif
+
+float SpawnPoint_Send(entity to, int sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_SPAWNPOINT);
 
@@ -7,10 +24,10 @@ float SpawnPoint_Send(entity to, float sf)
        WriteShort(MSG_ENTITY, self.origin.y);
        WriteShort(MSG_ENTITY, self.origin.z);
 
-       return TRUE;
+       return true;
 }
 
-float SpawnEvent_Send(entity to, float sf)
+float SpawnEvent_Send(entity to, int sf)
 {
        float send;
 
@@ -22,14 +39,14 @@ float SpawnEvent_Send(entity to, float sf)
                WriteShort(MSG_ENTITY, self.owner.origin.x);
                WriteShort(MSG_ENTITY, self.owner.origin.y);
                WriteShort(MSG_ENTITY, self.owner.origin.z);
-               send = TRUE;
+               send = true;
        }
        else if((to == self.owner) || (IS_SPEC(to) && (to.enemy == self.owner)) )
        {
                WriteByte(MSG_ENTITY, 0);
-               send = TRUE;
+               send = true;
        }
-       else { send = FALSE; }
+       else { send = false; }
 
        return send;
 }
@@ -50,7 +67,7 @@ void relocate_spawnpoint()
     // nudge off the floor
     setorigin(self, self.origin + '0 0 1');
 
-    tracebox(self.origin, PL_MIN, PL_MAX, self.origin, TRUE, self);
+    tracebox(self.origin, PL_MIN, PL_MAX, self.origin, true, self);
     if (trace_startsolid)
     {
         vector o;
@@ -127,7 +144,7 @@ void relocate_spawnpoint()
                ||
                autocvar_g_spawn_useallspawns
        )
-       { Net_LinkEntity(self, FALSE, 0, SpawnPoint_Send); }
+       { Net_LinkEntity(self, false, 0, SpawnPoint_Send); }
 }
 
 void spawnfunc_info_player_survivor (void)