X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Frace.qc;h=9fd6ca7b3f9d2f0db732ebcd6a673d7c9b0ea30a;hb=d271f27a5ac351a3a7b39636932f6d661492be1d;hp=8f9dccf91a24f3ae0e5e8ea77cbda4f0ca79d437;hpb=3589bb7872babf0ee489a54c85c9213562c1ffe9;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 8f9dccf91..9fd6ca7b3 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -1,5 +1,4 @@ #include "race.qh" -#include "_all.qh" #include "cl_client.qh" #include "portals.qh" @@ -9,9 +8,19 @@ #include "bot/navigation.qh" #include "command/getreplies.qh" #include "../common/deathtypes/all.qh" -#include "../common/notifications.qh" +#include "../common/notifications/all.qh" #include "../common/mapinfo.qh" -#include "../warpzonelib/util_server.qh" +#include "../common/triggers/subs.qh" +#include "../lib/warpzone/util_server.qh" +#include "../lib/warpzone/common.qh" +#include "../common/mutators/mutator/waypoints/waypointsprites.qh" + +void race_InitSpectator() +{ + if(g_race_qualifying) + if(msg_entity.enemy.race_laptime) + race_SendNextCheckpoint(msg_entity.enemy, 1); +} void W_Porto_Fail(float failhard); @@ -162,9 +171,8 @@ void race_SendNextCheckpoint(entity e, float spec) // qualifying only if(!spec) msg_entity = e; - WRITESPECTATABLE_MSG_ONE({ - WriteByte(MSG_ONE, SVC_TEMPENTITY); - WriteByte(MSG_ONE, TE_CSQC_RACE); + WRITESPECTATABLE_MSG_ONE(msg_entity, { + WriteHeader(MSG_ONE, TE_CSQC_RACE); if(spec) { WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_NEXT_SPEC_QUALIFYING); @@ -182,8 +190,7 @@ void race_SendNextCheckpoint(entity e, float spec) // qualifying only void race_send_recordtime(float msg) { // send the server best time - WriteByte(msg, SVC_TEMPENTITY); - WriteByte(msg, TE_CSQC_RACE); + WriteHeader(msg, TE_CSQC_RACE); WriteByte(msg, RACE_NET_SERVER_RECORD); WriteInt24_t(msg, race_readTime(GetMapname(), 1)); } @@ -192,8 +199,7 @@ void race_send_recordtime(float msg) void race_send_speedaward(float msg) { // send the best speed of the round - WriteByte(msg, SVC_TEMPENTITY); - WriteByte(msg, TE_CSQC_RACE); + WriteHeader(msg, TE_CSQC_RACE); WriteByte(msg, RACE_NET_SPEED_AWARD); WriteInt24_t(msg, floor(speedaward_speed+0.5)); WriteString(msg, speedaward_holder); @@ -202,8 +208,7 @@ void race_send_speedaward(float msg) void race_send_speedaward_alltimebest(float msg) { // send the best speed - WriteByte(msg, SVC_TEMPENTITY); - WriteByte(msg, TE_CSQC_RACE); + WriteHeader(msg, TE_CSQC_RACE); WriteByte(msg, RACE_NET_SPEED_AWARD_BEST); WriteInt24_t(msg, floor(speedaward_alltimebest+0.5)); WriteString(msg, speedaward_alltimebest_holder); @@ -211,8 +216,7 @@ void race_send_speedaward_alltimebest(float msg) void race_SendRankings(float pos, float prevpos, float del, float msg) { - WriteByte(msg, SVC_TEMPENTITY); - WriteByte(msg, TE_CSQC_RACE); + WriteHeader(msg, TE_CSQC_RACE); WriteByte(msg, RACE_NET_SERVER_RANKINGS); WriteShort(msg, pos); WriteShort(msg, prevpos); @@ -232,9 +236,8 @@ void race_SendStatus(float id, entity e) else msg = MSG_ALL; msg_entity = e; - WRITESPECTATABLE_MSG_ONE_VARNAME(dummy3, { - WriteByte(msg, SVC_TEMPENTITY); - WriteByte(msg, TE_CSQC_RACE); + WRITESPECTATABLE_MSG_ONE(msg_entity, { + WriteHeader(msg, TE_CSQC_RACE); WriteByte(msg, RACE_NET_SERVER_STATUS); WriteShort(msg, id); WriteString(msg, e.netname); @@ -332,8 +335,8 @@ void race_deleteTime(string map, float pos) { if (i == RANKINGS_CNT) { - db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), string_null); - db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), string_null); + db_remove(ServerProgsDB, strcat(map, rr, "time", ftos(i))); + db_remove(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i))); } else { @@ -354,7 +357,6 @@ void race_deleteTime(string map, float pos) void race_SendTime(entity e, float cp, float t, float tvalid) { float snew, l; - entity p; if(g_race_qualifying) t += e.race_penalty_accumulator; @@ -414,10 +416,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid) if(cp == race_timed_checkpoint) { race_setTime(GetMapname(), t, e.crypto_idfp, e.netname, e); - if(g_cts && autocvar_g_cts_finish_kill_delay) - { - CTS_ClientKill(e); - } + MUTATOR_CALLHOOK(Race_FinalCheckpoint, e); } if(t < recordtime || recordtime == 0) { @@ -427,9 +426,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid) race_checkpoint_recordholders[cp] = strzone(e.netname); if(g_race_qualifying) { - FOR_EACH_REALPLAYER(p) - if(p.race_checkpoint == cp) - race_SendNextCheckpoint(p, 0); + FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it) && it.race_checkpoint == cp, LAMBDA(race_SendNextCheckpoint(it, 0))); } } } @@ -447,9 +444,8 @@ void race_SendTime(entity e, float cp, float t, float tvalid) msg_entity = e; if(g_race_qualifying) { - WRITESPECTATABLE_MSG_ONE_VARNAME(dummy1, { - WriteByte(MSG_ONE, SVC_TEMPENTITY); - WriteByte(MSG_ONE, TE_CSQC_RACE); + 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 WriteInt24_t(MSG_ONE, t); // time to that intermediate @@ -476,9 +472,8 @@ void race_SendTime(entity e, float cp, float t, float tvalid) if(IS_REAL_CLIENT(e)) { msg_entity = e; - WRITESPECTATABLE_MSG_ONE_VARNAME(dummy2, { - WriteByte(MSG_ONE, SVC_TEMPENTITY); - WriteByte(MSG_ONE, TE_CSQC_RACE); + 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 if(e == oth) @@ -503,9 +498,8 @@ void race_SendTime(entity e, float cp, float t, float tvalid) if(IS_REAL_CLIENT(oth)) { msg_entity = oth; - WRITESPECTATABLE_MSG_ONE_VARNAME(dummy3, { - WriteByte(MSG_ONE, SVC_TEMPENTITY); - WriteByte(MSG_ONE, TE_CSQC_RACE); + 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 if(e == oth) @@ -537,9 +531,8 @@ void race_ClearTime(entity e) return; msg_entity = e; - WRITESPECTATABLE_MSG_ONE({ - WriteByte(MSG_ONE, SVC_TEMPENTITY); - WriteByte(MSG_ONE, TE_CSQC_RACE); + WRITESPECTATABLE_MSG_ONE(msg_entity, { + WriteHeader(MSG_ONE, TE_CSQC_RACE); WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_CLEAR); // next }); } @@ -672,7 +665,7 @@ void checkpoint_passed() other.race_checkpoint = race_NextCheckpoint(self.race_checkpoint); other.race_started = 1; - race_SendTime(other, self.race_checkpoint, other.race_movetime, !!other.race_laptime); + race_SendTime(other, self.race_checkpoint, other.race_movetime, boolean(other.race_laptime)); if(!self.race_checkpoint) // start line { @@ -733,67 +726,58 @@ float race_waypointsprite_visible_for_player(entity e) return false; } -float have_verified; -void trigger_race_checkpoint_verify() -{SELFPARAM(); - entity cp; - float i, p; - float qual; - - if(have_verified) - return; - have_verified = 1; +void trigger_race_checkpoint_verify(entity this) +{ + static bool have_verified; + if (have_verified) return; + have_verified = true; - qual = g_race_qualifying; + bool qual = g_race_qualifying; - setself(spawn()); - self.classname = "player"; + int pl_race_checkpoint = 0; + int pl_race_place = 0; - if(g_race) - { - for(i = 0; i <= race_highest_checkpoint; ++i) - { - self.race_checkpoint = race_NextCheckpoint(i); + if (g_race) { + for (int i = 0; i <= race_highest_checkpoint; ++i) { + pl_race_checkpoint = race_NextCheckpoint(i); // race only (middle of the race) - g_race_qualifying = 0; - self.race_place = 0; - if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, false)) - error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for respawning in race) - bailing out")); + g_race_qualifying = false; + pl_race_place = 0; + if (!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, false)) { + error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(pl_race_place), " (used for respawning in race) - bailing out")); + } - if(i == 0) - { + if (i == 0) { // qualifying only g_race_qualifying = 1; - self.race_place = race_lowest_place_spawn; - if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, false)) - error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for qualifying) - bailing out")); + pl_race_place = race_lowest_place_spawn; + if (!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, false)) { + error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(pl_race_place), " (used for qualifying) - bailing out")); + } // race only (initial spawn) g_race_qualifying = 0; - for(p = 1; p <= race_highest_place_spawn; ++p) - { - self.race_place = p; - if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, false)) - error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for initially spawning in race) - bailing out")); + for (int p = 1; p <= race_highest_place_spawn; ++p) { + pl_race_place = p; + if (!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, false)) { + error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(pl_race_place), " (used for initially spawning in race) - bailing out")); + } } } } - } - else if(!defrag_ents) - { + } else if (!defrag_ents) { // qualifying only - self.race_checkpoint = race_NextCheckpoint(0); + pl_race_checkpoint = race_NextCheckpoint(0); g_race_qualifying = 1; - self.race_place = race_lowest_place_spawn; - if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, false)) - error(strcat("Checkpoint 0 misses a spawnpoint with race_place==", ftos(self.race_place), " (used for qualifying) - bailing out")); - } - else - { - self.race_checkpoint = race_NextCheckpoint(0); + pl_race_place = race_lowest_place_spawn; + if (!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, false)) { + error(strcat("Checkpoint 0 misses a spawnpoint with race_place==", ftos(pl_race_place), " (used for qualifying) - bailing out")); + } + } else { + pl_race_checkpoint = race_NextCheckpoint(0); g_race_qualifying = 1; - self.race_place = 0; // there's only one spawn on defrag maps + pl_race_place = 0; // there's only one spawn on defrag maps // check if a defragcp file already exists, then read it and apply the checkpoint order float fh; @@ -801,19 +785,18 @@ void trigger_race_checkpoint_verify() string l; defragcpexists = fh = fopen(strcat("maps/", GetMapname(), ".defragcp"), FILE_READ); - if(fh >= 0) - { - while((l = fgets(fh))) - { + if (fh >= 0) { + while ((l = fgets(fh))) { len = tokenize_console(l); - if(len != 2) - { + if (len != 2) { defragcpexists = -1; // something's wrong in the defrag cp file, set defragcpexists to -1 so that it will be rewritten when someone finishes continue; } - for(cp = world; (cp = find(cp, classname, "target_checkpoint"));) - if(argv(0) == cp.targetname) + for (entity cp = world; (cp = find(cp, classname, "target_checkpoint"));) { + if (argv(0) == cp.targetname) { cp.race_checkpoint = stof(argv(1)); + } + } } fclose(fh); } @@ -821,60 +804,55 @@ void trigger_race_checkpoint_verify() g_race_qualifying = qual; - if(race_timed_checkpoint) - { - if(defrag_ents) - { - for(cp = world; (cp = find(cp, classname, "target_startTimer"));) + if (race_timed_checkpoint) { + if (defrag_ents) { + for (entity cp = world; (cp = find(cp, classname, "target_startTimer"));) { WaypointSprite_UpdateSprites(cp.sprite, WP_RaceStart, WP_Null, WP_Null); - for(cp = world; (cp = find(cp, classname, "target_stopTimer"));) + } + for (entity cp = world; (cp = find(cp, classname, "target_stopTimer"));) { WaypointSprite_UpdateSprites(cp.sprite, WP_RaceFinish, WP_Null, WP_Null); - - for(cp = world; (cp = find(cp, classname, "target_checkpoint"));) - { - if(cp.race_checkpoint == -2) // something's wrong with the defrag cp file or it has not been written yet, set defragcpexists to -1 so that it will be rewritten when someone finishes + } + for (entity cp = world; (cp = find(cp, classname, "target_checkpoint"));) { + if (cp.race_checkpoint == -2) { // something's wrong with the defrag cp file or it has not been written yet, set defragcpexists to -1 so that it will be rewritten when someone finishes defragcpexists = -1; + } } - - if(defragcpexists != -1) - { + if (defragcpexists != -1) { float largest_cp_id = 0; - for(cp = world; (cp = find(cp, classname, "target_checkpoint"));) - if(cp.race_checkpoint > largest_cp_id) + for (entity cp = world; (cp = find(cp, classname, "target_checkpoint"));) { + if (cp.race_checkpoint > largest_cp_id) { largest_cp_id = cp.race_checkpoint; - for(cp = world; (cp = find(cp, classname, "target_stopTimer"));) + } + } + for (entity cp = world; (cp = find(cp, classname, "target_stopTimer"));) { cp.race_checkpoint = largest_cp_id + 1; // finish line + } race_highest_checkpoint = largest_cp_id + 1; race_timed_checkpoint = largest_cp_id + 1; - } - else - { - for(cp = world; (cp = find(cp, classname, "target_stopTimer"));) + } else { + for (entity cp = world; (cp = find(cp, classname, "target_stopTimer"));) { cp.race_checkpoint = 255; // finish line + } race_highest_checkpoint = 255; race_timed_checkpoint = 255; } - } - else - { - for(cp = world; (cp = find(cp, classname, "trigger_race_checkpoint")); ) - if(cp.sprite) - { - if(cp.race_checkpoint == 0) + } else { + for (entity cp = world; (cp = find(cp, classname, "trigger_race_checkpoint")); ) { + if (cp.sprite) { + if (cp.race_checkpoint == 0) { WaypointSprite_UpdateSprites(cp.sprite, WP_RaceStart, WP_Null, WP_Null); - else if(cp.race_checkpoint == race_timed_checkpoint) + } else if (cp.race_checkpoint == race_timed_checkpoint) { WaypointSprite_UpdateSprites(cp.sprite, WP_RaceFinish, WP_Null, WP_Null); + } } + } } } - if(defrag_ents) - { - entity trigger, targ; - for(trigger = world; (trigger = find(trigger, classname, "trigger_multiple")); ) - for(targ = world; (targ = find(targ, targetname, trigger.target)); ) - if (targ.classname == "target_checkpoint" || targ.classname == "target_startTimer" || targ.classname == "target_stopTimer") - { + if (defrag_ents) { + for (entity trigger = world; (trigger = find(trigger, classname, "trigger_multiple")); ) { + for (entity targ = world; (targ = find(targ, targetname, trigger.target)); ) { + if (targ.classname == "target_checkpoint" || targ.classname == "target_startTimer" || targ.classname == "target_stopTimer") { trigger.wait = 0; trigger.delay = 0; targ.wait = 0; @@ -892,9 +870,9 @@ void trigger_race_checkpoint_verify() //setorigin(targ, trigger.origin); //remove(trigger); } + } + } } - remove(self); - setself(this); } vector trigger_race_checkpoint_spawn_evalfunc(entity player, entity spot, vector current) @@ -941,7 +919,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; @@ -990,7 +968,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; @@ -1034,11 +1012,8 @@ void race_AbandonRaceCheck(entity p) void race_StartCompleting() { - entity p; race_completing = 1; - FOR_EACH_PLAYER(p) - if(p.deadflag != DEAD_NO) - race_AbandonRaceCheck(p); + FOREACH_CLIENT(IS_PLAYER(it) && IS_DEAD(it), LAMBDA(race_AbandonRaceCheck(it))); } void race_PreparePlayer() @@ -1083,13 +1058,11 @@ void race_ClearRecords() race_checkpoint_recordholders[i] = string_null; } - entity e; - FOR_EACH_CLIENT(e) - { - float p = e.race_place; - WITH(entity, self, e, race_PreparePlayer()); - e.race_place = p; - } + FOREACH_CLIENT(true, LAMBDA( + float p = it.race_place; + WITHSELF(it, race_PreparePlayer()); + it.race_place = p; + )); } void race_ImposePenaltyTime(entity pl, float penalty, string reason) @@ -1100,9 +1073,8 @@ void race_ImposePenaltyTime(entity pl, float penalty, string reason) if(IS_REAL_CLIENT(pl)) { msg_entity = pl; - WRITESPECTATABLE_MSG_ONE({ - WriteByte(MSG_ONE, SVC_TEMPENTITY); - WriteByte(MSG_ONE, TE_CSQC_RACE); + WRITESPECTATABLE_MSG_ONE(msg_entity, { + WriteHeader(MSG_ONE, TE_CSQC_RACE); WriteByte(MSG_ONE, RACE_NET_PENALTY_QUALIFYING); WriteShort(MSG_ONE, TIME_ENCODE(penalty)); WriteString(MSG_ONE, reason); @@ -1115,9 +1087,8 @@ void race_ImposePenaltyTime(entity pl, float penalty, string reason) if(IS_REAL_CLIENT(pl)) { msg_entity = pl; - WRITESPECTATABLE_MSG_ONE_VARNAME(dummy, { - WriteByte(MSG_ONE, SVC_TEMPENTITY); - WriteByte(MSG_ONE, TE_CSQC_RACE); + WRITESPECTATABLE_MSG_ONE(msg_entity, { + WriteHeader(MSG_ONE, TE_CSQC_RACE); WriteByte(MSG_ONE, RACE_NET_PENALTY_RACE); WriteShort(MSG_ONE, TIME_ENCODE(penalty)); WriteString(MSG_ONE, reason); @@ -1143,6 +1114,9 @@ void penalty_use() spawnfunc(trigger_race_penalty) { + // TODO: find out why this wasnt done: + //if(!g_cts && !g_race) { remove(self); return; } + EXACTTRIGGER_INIT; self.use = penalty_use;