Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index a39947c0532581a99a78a6bcbf6074dc8848327e..bffb221a24287bd4671ca615b7a12d2cd69b68e8 100644 (file)
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -1,24 +1,19 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../common/constants.qh"
-    #include "../common/util.qh"
-    #include "autocvars.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/sv_cmd.qh"
-    #include "portals.qh"
-    #include "scores.qh"
-    #include "spawnpoints.qh"
-    #include "race.qh"
-#endif
+#include "race.qh"
+#include "_all.qh"
+
+#include "cl_client.qh"
+#include "portals.qh"
+#include "scores.qh"
+#include "spawnpoints.qh"
+#include "bot/waypoints.qh"
+#include "bot/navigation.qh"
+#include "command/getreplies.qh"
+#include "../common/deathtypes.qh"
+#include "../common/notifications.qh"
+#include "../common/mapinfo.qh"
+#include "../warpzonelib/util_server.qh"
+
+void W_Porto_Fail(float failhard);
 
 float race_readTime(string map, float pos)
 {
@@ -97,7 +92,6 @@ void spawnfunc_target_checkpoint();
 .float race_penalty_accumulator;
 .string race_penalty_reason;
 .float race_checkpoint; // player: next checkpoint that has to be reached
-.float race_laptime;
 .entity race_lastpenalty;
 
 .entity sprite;
@@ -194,6 +188,27 @@ void race_send_recordtime(float msg)
        WriteInt24_t(msg, race_readTime(GetMapname(), 1));
 }
 
+
+void race_send_speedaward(float msg)
+{
+       // send the best speed of the round
+       WriteByte(msg, SVC_TEMPENTITY);
+       WriteByte(msg, TE_CSQC_RACE);
+       WriteByte(msg, RACE_NET_SPEED_AWARD);
+       WriteInt24_t(msg, floor(speedaward_speed+0.5));
+       WriteString(msg, speedaward_holder);
+}
+
+void race_send_speedaward_alltimebest(float msg)
+{
+       // send the best speed
+       WriteByte(msg, SVC_TEMPENTITY);
+       WriteByte(msg, TE_CSQC_RACE);
+       WriteByte(msg, RACE_NET_SPEED_AWARD_BEST);
+       WriteInt24_t(msg, floor(speedaward_alltimebest+0.5));
+       WriteString(msg, speedaward_alltimebest_holder);
+}
+
 void race_SendRankings(float pos, float prevpos, float del, float msg)
 {
        WriteByte(msg, SVC_TEMPENTITY);
@@ -533,22 +548,22 @@ void dumpsurface(entity e)
 {
        float n, si, ni;
        vector norm, vec;
-       print("Surfaces of ", etos(e), ":\n");
+       LOG_INFO("Surfaces of ", etos(e), ":\n");
 
-       print("TEST = ", ftos(getsurfacenearpoint(e, '0 0 0')), "\n");
+       LOG_INFO("TEST = ", ftos(getsurfacenearpoint(e, '0 0 0')), "\n");
 
        for(si = 0; ; ++si)
        {
                n = getsurfacenumpoints(e, si);
                if(n <= 0)
                        break;
-               print("  Surface ", ftos(si), ":\n");
+               LOG_INFO("  Surface ", ftos(si), ":\n");
                norm = getsurfacenormal(e, si);
-               print("    Normal = ", vtos(norm), "\n");
+               LOG_INFO("    Normal = ", vtos(norm), "\n");
                for(ni = 0; ni < n; ++ni)
                {
                        vec = getsurfacepoint(e, si, ni);
-                       print("    Point ", ftos(ni), " = ", vtos(vec), " (", ftos(norm * vec), ")\n");
+                       LOG_INFO("    Point ", ftos(ni), " = ", vtos(vec), " (", ftos(norm * vec), ")\n");
                }
        }
 }
@@ -812,9 +827,9 @@ void trigger_race_checkpoint_verify()
                if(defrag_ents)
                {
                        for(cp = world; (cp = find(cp, classname, "target_startTimer"));)
-                               WaypointSprite_UpdateSprites(cp.sprite, "race-start", "", "");
+                               WaypointSprite_UpdateSprites(cp.sprite, WP_RaceStart, WP_Null, WP_Null);
                        for(cp = world; (cp = find(cp, classname, "target_stopTimer"));)
-                               WaypointSprite_UpdateSprites(cp.sprite, "race-finish", "", "");
+                               WaypointSprite_UpdateSprites(cp.sprite, WP_RaceFinish, WP_Null, WP_Null);
 
                        for(cp = world; (cp = find(cp, classname, "target_checkpoint"));)
                        {
@@ -847,9 +862,9 @@ void trigger_race_checkpoint_verify()
                                if(cp.sprite)
                                {
                                        if(cp.race_checkpoint == 0)
-                                               WaypointSprite_UpdateSprites(cp.sprite, "race-start", "", "");
+                                               WaypointSprite_UpdateSprites(cp.sprite, WP_RaceStart, WP_Null, WP_Null);
                                        else if(cp.race_checkpoint == race_timed_checkpoint)
-                                               WaypointSprite_UpdateSprites(cp.sprite, "race-finish", "", "");
+                                               WaypointSprite_UpdateSprites(cp.sprite, WP_RaceFinish, WP_Null, WP_Null);
                                }
                }
        }
@@ -952,9 +967,9 @@ void spawnfunc_trigger_race_checkpoint()
        if(!self.race_penalty)
        {
                if(self.race_checkpoint)
-                       WaypointSprite_SpawnFixed("race-checkpoint", o, self, sprite, RADARICON_NONE, '1 0.5 0');
+                       WaypointSprite_SpawnFixed(WP_RaceCheckpoint, o, self, sprite, RADARICON_NONE);
                else
-                       WaypointSprite_SpawnFixed("race-start-finish", o, self, sprite, RADARICON_NONE, '1 0.5 0');
+                       WaypointSprite_SpawnFixed(WP_RaceStartFinish, o, self, sprite, RADARICON_NONE);
        }
 
        self.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player;
@@ -995,9 +1010,9 @@ void spawnfunc_target_checkpoint() // defrag entity
        race_timed_checkpoint = 1;
 
        if(self.race_checkpoint == 0)
-               WaypointSprite_SpawnFixed("race-start", o, self, sprite, RADARICON_NONE, '1 0.5 0');
+               WaypointSprite_SpawnFixed(WP_RaceStart, o, self, sprite, RADARICON_NONE);
        else
-               WaypointSprite_SpawnFixed("race-checkpoint", o, self, sprite, RADARICON_NONE, '1 0.5 0');
+               WaypointSprite_SpawnFixed(WP_RaceCheckpoint, o, self, sprite, RADARICON_NONE);
 
        self.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player;