Move assault winning condition function into the assault file

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

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index dbc59457b87c427318db661d7862f9c57f64e51a..0cac389aaf753368f18ce4e52b23a5fb6357d5a1 100644 (file)
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -171,7 +171,7 @@ void race_SendNextCheckpoint(entity e, float spec) // qualifying only
 
        if(!spec)
                msg_entity = e;
-       WRITESPECTATABLE_MSG_ONE({
+       WRITESPECTATABLE_MSG_ONE(msg_entity, {
                WriteHeader(MSG_ONE, TE_CSQC_RACE);
                if(spec)
                {
@@ -236,7 +236,7 @@ void race_SendStatus(float id, entity e)
        else
                msg = MSG_ALL;
        msg_entity = e;
-       WRITESPECTATABLE_MSG_ONE_VARNAME(dummy3, {
+       WRITESPECTATABLE_MSG_ONE(msg_entity, {
                WriteHeader(msg, TE_CSQC_RACE);
                WriteByte(msg, RACE_NET_SERVER_STATUS);
                WriteShort(msg, id);
@@ -444,7 +444,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid)
                        msg_entity = e;
                        if(g_race_qualifying)
                        {
-                               WRITESPECTATABLE_MSG_ONE_VARNAME(dummy1, {
+                               WRITESPECTATABLE_MSG_ONE(msg_entity, {
                                        WriteHeader(MSG_ONE, TE_CSQC_RACE);
                                        WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_HIT_QUALIFYING);
                                        WriteByte(MSG_ONE, race_CheckpointNetworkID(cp)); // checkpoint the player now is at
@@ -472,7 +472,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid)
                if(IS_REAL_CLIENT(e))
                {
                        msg_entity = e;
-                       WRITESPECTATABLE_MSG_ONE_VARNAME(dummy2, {
+                       WRITESPECTATABLE_MSG_ONE(msg_entity, {
                                WriteHeader(MSG_ONE, TE_CSQC_RACE);
                                WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_HIT_RACE);
                                WriteByte(MSG_ONE, race_CheckpointNetworkID(cp)); // checkpoint the player now is at
@@ -498,7 +498,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid)
                if(IS_REAL_CLIENT(oth))
                {
                        msg_entity = oth;
-                       WRITESPECTATABLE_MSG_ONE_VARNAME(dummy3, {
+                       WRITESPECTATABLE_MSG_ONE(msg_entity, {
                                WriteHeader(MSG_ONE, TE_CSQC_RACE);
                                WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_HIT_RACE_BY_OPPONENT);
                                WriteByte(MSG_ONE, race_CheckpointNetworkID(cp)); // checkpoint the player now is at
@@ -531,7 +531,7 @@ void race_ClearTime(entity e)
                return;
 
        msg_entity = e;
-       WRITESPECTATABLE_MSG_ONE({
+       WRITESPECTATABLE_MSG_ONE(msg_entity, {
                WriteHeader(MSG_ONE, TE_CSQC_RACE);
                WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_CLEAR); // next
        });
@@ -934,7 +934,7 @@ spawnfunc(trigger_race_checkpoint)
                self.touch = checkpoint_touch;
 
        o = (self.absmin + self.absmax) * 0.5;
-       tracebox(o, PL_MIN, PL_MAX, o - '0 0 1' * (o.z - self.absmin.z), MOVE_NORMAL, self);
+       tracebox(o, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), o - '0 0 1' * (o.z - self.absmin.z), MOVE_NORMAL, self);
        waypoint_spawnforitem_force(self, trace_endpos);
        self.nearestwaypointtimeout = time + 1000000000;
 
@@ -983,7 +983,7 @@ spawnfunc(target_checkpoint) // defrag entity
                self.touch = checkpoint_touch;
 
        o = (self.absmin + self.absmax) * 0.5;
-       tracebox(o, PL_MIN, PL_MAX, o - '0 0 1' * (o.z - self.absmin.z), MOVE_NORMAL, self);
+       tracebox(o, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), o - '0 0 1' * (o.z - self.absmin.z), MOVE_NORMAL, self);
        waypoint_spawnforitem_force(self, trace_endpos);
        self.nearestwaypointtimeout = time + 1000000000;
 
@@ -1028,7 +1028,7 @@ void race_AbandonRaceCheck(entity p)
 void race_StartCompleting()
 {
        race_completing = 1;
-       FOREACH_CLIENT(IS_PLAYER(it) && it.deadflag != DEAD_NO, LAMBDA(race_AbandonRaceCheck(it)));
+       FOREACH_CLIENT(IS_PLAYER(it) && IS_DEAD(it), LAMBDA(race_AbandonRaceCheck(it)));
 }
 
 void race_PreparePlayer()
@@ -1088,7 +1088,7 @@ void race_ImposePenaltyTime(entity pl, float penalty, string reason)
                if(IS_REAL_CLIENT(pl))
                {
                        msg_entity = pl;
-                       WRITESPECTATABLE_MSG_ONE({
+                       WRITESPECTATABLE_MSG_ONE(msg_entity, {
                                WriteHeader(MSG_ONE, TE_CSQC_RACE);
                                WriteByte(MSG_ONE, RACE_NET_PENALTY_QUALIFYING);
                                WriteShort(MSG_ONE, TIME_ENCODE(penalty));
@@ -1102,7 +1102,7 @@ void race_ImposePenaltyTime(entity pl, float penalty, string reason)
                if(IS_REAL_CLIENT(pl))
                {
                        msg_entity = pl;
-                       WRITESPECTATABLE_MSG_ONE_VARNAME(dummy, {
+                       WRITESPECTATABLE_MSG_ONE(msg_entity, {
                                WriteHeader(MSG_ONE, TE_CSQC_RACE);
                                WriteByte(MSG_ONE, RACE_NET_PENALTY_RACE);
                                WriteShort(MSG_ONE, TIME_ENCODE(penalty));