#include "race.qh"
-#include "cl_client.qh"
+#include "client.qh"
#include "portals.qh"
#include "scores.qh"
#include "spawnpoints.qh"
#include "../common/deathtypes/all.qh"
#include "../common/notifications/all.qh"
#include "../common/mapinfo.qh"
+#include <common/net_linked.qh>
#include "../common/triggers/subs.qh"
#include "../lib/warpzone/util_server.qh"
#include "../lib/warpzone/common.qh"
#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
+IntrusiveList g_race_targets;
+STATIC_INIT(g_race_targets) { g_race_targets = IL_NEW(); }
+
void race_InitSpectator()
{
if(g_race_qualifying)
float race_readTime(string map, float pos)
{
- string rr = (g_cts) ? CTS_RECORD : RACE_RECORD;
+ string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD));
return stof(db_get(ServerProgsDB, strcat(map, rr, "time", ftos(pos))));
}
string race_readUID(string map, float pos)
{
- string rr = (g_cts) ? CTS_RECORD : RACE_RECORD;
+ string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD));
return db_get(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(pos)));
}
float race_readPos(string map, float t)
{
- float i;
- for (i = 1; i <= RANKINGS_CNT; ++i)
- if (race_readTime(map, i) == 0 || race_readTime(map, i) > t)
- return i;
+ for(int i = 1; i <= RANKINGS_CNT; ++i)
+ {
+ int mytime = race_readTime(map, i);
+ if(!mytime || mytime > t)
+ return i;
+ }
return 0; // pos is zero if unranked
}
void race_writeTime(string map, float t, string myuid)
{
- string rr = (g_cts) ? CTS_RECORD : RACE_RECORD;
+ string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD));
float newpos;
newpos = race_readPos(map, t);
string race_readName(string map, float pos)
{
- string rr = (g_cts) ? CTS_RECORD : RACE_RECORD;
+ string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD));
return uid2name(db_get(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(pos))));
}
});
}
-void race_setTime(string map, float t, string myuid, string mynetname, entity e)
+void race_setTime(string map, float t, string myuid, string mynetname, entity e, bool showmessage)
{
// netname only used TEMPORARILY for printing
- float newpos, player_prevpos;
- newpos = race_readPos(map, t);
+ int newpos = race_readPos(map, t);
- float i;
- player_prevpos = 0;
- for(i = 1; i <= RANKINGS_CNT; ++i)
+ int player_prevpos = 0;
+ for(int i = 1; i <= RANKINGS_CNT; ++i)
{
if(race_readUID(map, i) == myuid)
player_prevpos = i;
{
oldrec = race_readTime(GetMapname(), player_prevpos);
race_SendStatus(0, e); // "fail"
- Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_FAIL_RANKED, mynetname, player_prevpos, t, oldrec);
+ if(showmessage)
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_FAIL_RANKED, mynetname, player_prevpos, t, oldrec);
return;
}
else if (!newpos)
// no ranking, time worse than the worst ranked
oldrec = race_readTime(GetMapname(), RANKINGS_CNT);
race_SendStatus(0, e); // "fail"
- Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_FAIL_UNRANKED, mynetname, RANKINGS_CNT, t, oldrec);
+ if(showmessage)
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_FAIL_UNRANKED, mynetname, RANKINGS_CNT, t, oldrec);
return;
}
// if the player does not have a UID we can unfortunately not store the record, as the rankings system relies on UIDs
if(myuid == "")
{
- Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_MISSING_UID, mynetname, t);
+ if(showmessage)
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_MISSING_UID, mynetname, t);
+ return;
+ }
+
+ if(uid2name(myuid) == "^1Unregistered Player")
+ {
+ if(showmessage)
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_MISSING_NAME, mynetname, t);
return;
}
// store new ranking
race_writeTime(GetMapname(), t, myuid);
- if (newpos == 1)
+ if (newpos == 1 && showmessage)
{
write_recordmarker(e, time - TIME_DECODE(t), TIME_DECODE(t));
race_send_recordtime(MSG_ALL);
if(newpos == player_prevpos)
{
- Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_IMPROVED, mynetname, newpos, t, oldrec);
+ if(showmessage)
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_IMPROVED, mynetname, newpos, t, oldrec);
if(newpos == 1) { race_SendStatus(3, e); } // "new server record"
else { race_SendStatus(1, e); } // "new time"
}
else if(oldrec == 0)
{
- Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_SET, mynetname, newpos, t);
+ if(showmessage)
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_SET, mynetname, newpos, t);
if(newpos == 1) { race_SendStatus(3, e); } // "new server record"
else { race_SendStatus(2, e); } // "new rank"
}
else
{
- Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_BROKEN, mynetname, oldrec_holder, newpos, t, oldrec);
+ if(showmessage)
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_BROKEN, mynetname, oldrec_holder, newpos, t, oldrec);
if(newpos == 1) { race_SendStatus(3, e); } // "new server record"
else { race_SendStatus(2, e); } // "new rank"
}
void race_deleteTime(string map, float pos)
{
- string rr;
- if(g_cts)
- rr = CTS_RECORD;
- else
- rr = RACE_RECORD;
+ string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD));
- float i;
- for (i = pos; i <= RANKINGS_CNT; ++i)
+ for(int i = pos; i <= RANKINGS_CNT; ++i)
{
+ string therank = ftos(i);
if (i == RANKINGS_CNT)
{
- db_remove(ServerProgsDB, strcat(map, rr, "time", ftos(i)));
- db_remove(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)));
+ db_remove(ServerProgsDB, strcat(map, rr, "time", therank));
+ db_remove(ServerProgsDB, strcat(map, rr, "crypto_idfp", therank));
}
else
{
- db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(race_readTime(GetMapname(), i+1)));
- db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(GetMapname(), i+1));
+ db_put(ServerProgsDB, strcat(map, rr, "time", therank), ftos(race_readTime(GetMapname(), i+1)));
+ db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", therank), race_readUID(GetMapname(), i+1));
}
}
t += e.race_penalty_accumulator;
t = TIME_ENCODE(t); // make integer
- // adding just 0.4 so it rounds down in the .5 case (matching the timer display)
if(tvalid)
if(cp == race_timed_checkpoint) // finish line
{
if(cp == race_timed_checkpoint)
{
- race_setTime(GetMapname(), t, e.crypto_idfp, e.netname, e);
+ race_setTime(GetMapname(), t, e.crypto_idfp, e.netname, e, true);
MUTATOR_CALLHOOK(Race_FinalCheckpoint, e);
}
if(t < recordtime || recordtime == 0)
void checkpoint_passed(entity this, entity player)
{
+ if(player.personal && autocvar_g_allow_checkpoints)
+ return; // practice mode!
+
string oldmsg;
entity cp;
g_race_qualifying = qual;
+ IL_EACH(g_race_targets, true,
+ {
+ entity cpt = it;
+ FOREACH_ENTITY_STRING(target, cpt.targetname,
+ {
+ vector org = (this.absmin + this.absmax) * 0.5;
+ if(cpt.race_checkpoint == 0)
+ WaypointSprite_SpawnFixed(WP_RaceStart, org, it, sprite, RADARICON_NONE);
+ else
+ WaypointSprite_SpawnFixed(WP_RaceCheckpoint, org, it, sprite, RADARICON_NONE);
+
+ it.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player;
+ });
+ });
+
if (race_timed_checkpoint) {
if (defrag_ents) {
- for (entity cp = NULL; (cp = find(cp, classname, "target_startTimer"));) {
- WaypointSprite_UpdateSprites(cp.sprite, WP_RaceStart, WP_Null, WP_Null);
- }
- for (entity cp = NULL; (cp = find(cp, classname, "target_stopTimer"));) {
- WaypointSprite_UpdateSprites(cp.sprite, WP_RaceFinish, WP_Null, WP_Null);
- }
- for (entity cp = NULL; (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;
- }
- }
+ IL_EACH(g_race_targets, true,
+ {
+ entity cpt = it;
+ if(it.classname == "target_startTimer" || it.classname == "target_stopTimer") {
+ FOREACH_ENTITY_STRING(target, cpt.targetname, {
+ WaypointSprite_UpdateSprites(it.sprite, ((cpt.classname == "target_startTimer") ? WP_RaceStart : WP_RaceFinish), WP_Null, WP_Null);
+ });
+ }
+ if(it.classname == "target_checkpoint") {
+ if(it.race_checkpoint == -2)
+ defragcpexists = -1; // 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
+ }
+ });
if (defragcpexists != -1) {
float largest_cp_id = 0;
for (entity cp = NULL; (cp = find(cp, classname, "target_checkpoint"));) {
race_timed_checkpoint = 255;
}
} else {
- for (entity cp = NULL; (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) {
- WaypointSprite_UpdateSprites(cp.sprite, WP_RaceFinish, WP_Null, WP_Null);
- }
+ IL_EACH(g_racecheckpoints, it.sprite,
+ {
+ if (it.race_checkpoint == 0) {
+ WaypointSprite_UpdateSprites(it.sprite, WP_RaceStart, WP_Null, WP_Null);
+ } else if (it.race_checkpoint == race_timed_checkpoint) {
+ WaypointSprite_UpdateSprites(it.sprite, WP_RaceFinish, WP_Null, WP_Null);
}
- }
+ });
}
}
settouch(this, checkpoint_touch);
o = (this.absmin + this.absmax) * 0.5;
- tracebox(o, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), o - '0 0 1' * (o.z - this.absmin.z), MOVE_NORMAL, this);
+ tracebox(o, PL_MIN_CONST, PL_MAX_CONST, o - '0 0 1' * (o.z - this.absmin.z), MOVE_NORMAL, this);
waypoint_spawnforitem_force(this, trace_endpos);
- this.nearestwaypointtimeout = time + 1000000000;
+ this.nearestwaypointtimeout = -1;
if(this.message == "")
this.message = "went backwards";
this.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player;
this.spawn_evalfunc = trigger_race_checkpoint_spawn_evalfunc;
+ IL_PUSH(g_racecheckpoints, this);
+
InitializeEntity(this, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET);
}
spawnfunc(target_checkpoint) // defrag entity
{
- vector o;
if(!g_race && !g_cts) { delete(this); return; }
defrag_ents = 1;
- EXACTTRIGGER_INIT;
+ // if this is targeted, then it probably isn't a trigger
+ bool is_trigger = !boolean(!this.nottargeted && this.targetname != "");
+
+ if(is_trigger)
+ EXACTTRIGGER_INIT;
this.use = checkpoint_use;
- if (!(this.spawnflags & 1))
+ if (is_trigger && !(this.spawnflags & 1))
settouch(this, checkpoint_touch);
- o = (this.absmin + this.absmax) * 0.5;
- tracebox(o, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), o - '0 0 1' * (o.z - this.absmin.z), MOVE_NORMAL, this);
- waypoint_spawnforitem_force(this, trace_endpos);
- this.nearestwaypointtimeout = time + 1000000000;
+ vector org = this.origin;
+
+ // bots should only pathfind to this if it is a valid touchable trigger
+ if(is_trigger)
+ {
+ org = (this.absmin + this.absmax) * 0.5;
+ tracebox(org, PL_MIN_CONST, PL_MAX_CONST, org - '0 0 1' * (org.z - this.absmin.z), MOVE_NORMAL, this);
+ waypoint_spawnforitem_force(this, trace_endpos);
+ this.nearestwaypointtimeout = -1;
+ }
if(this.message == "")
this.message = "went backwards";
race_timed_checkpoint = 1;
- if(this.race_checkpoint == 0)
- WaypointSprite_SpawnFixed(WP_RaceStart, o, this, sprite, RADARICON_NONE);
- else
- WaypointSprite_SpawnFixed(WP_RaceCheckpoint, o, this, sprite, RADARICON_NONE);
-
- this.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player;
+ IL_PUSH(g_race_targets, this);
InitializeEntity(this, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET);
}
vector o0, o1;
float bestfraction, fraction;
- entity lastcp, cp0, cp1;
+ entity lastcp;
float nextcpindex, lastcpindex;
nextcpindex = max(e.race_checkpoint, 0);
return l; // finish
bestfraction = 1;
- for(cp0 = NULL; (cp0 = find(cp0, classname, "trigger_race_checkpoint")); )
+ IL_EACH(g_racecheckpoints, true,
{
- if(cp0.race_checkpoint != lastcpindex)
+ if(it.race_checkpoint != lastcpindex)
continue;
if(lastcp)
- if(cp0 != lastcp)
+ if(it != lastcp)
continue;
- o0 = (cp0.absmin + cp0.absmax) * 0.5;
- for(cp1 = NULL; (cp1 = find(cp1, classname, "trigger_race_checkpoint")); )
+ o0 = (it.absmin + it.absmax) * 0.5;
+ IL_EACH(g_racecheckpoints, true,
{
- if(cp1.race_checkpoint != nextcpindex)
+ if(it.race_checkpoint != nextcpindex)
continue;
- o1 = (cp1.absmin + cp1.absmax) * 0.5;
+ o1 = (it.absmin + it.absmax) * 0.5;
if(o0 == o1)
continue;
fraction = bound(0.0001, vlen(e.origin - o1) / vlen(o0 - o1), 1);
if(fraction < bestfraction)
bestfraction = fraction;
- }
- }
+ });
+ });
// we are at CP "nextcpindex - bestfraction"
// race_timed_checkpoint == 4: then nextcp==4 means 0.9999x, nextcp==0 means 0.0000x
projects / xonotic / xonotic-data.pk3dir.git / blobdiff