X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Frace.qc;h=2bd9f9668bc443bd021a7499656be2040c55e606;hb=85ee0c0e1aaa7dfd84ca4e40edf6fb6ee1049dca;hp=fc5ba4d61b6dc50866360fb4e3a6cadb05cfe35e;hpb=f34fd47ee0a7f283ab60592a17399ec5a500416c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index fc5ba4d61..2bd9f9668 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -9,11 +9,15 @@ #include "../common/deathtypes/all.qh" #include "../common/notifications/all.qh" #include "../common/mapinfo.qh" +#include #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) @@ -25,31 +29,33 @@ void W_Porto_Fail(entity this, float failhard); 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); @@ -86,7 +92,7 @@ void race_writeTime(string map, float t, string myuid) 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)))); } @@ -243,15 +249,13 @@ void race_SendStatus(float id, entity e) }); } -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; @@ -263,7 +267,8 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e) { 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) @@ -271,7 +276,8 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e) // 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; } @@ -280,7 +286,15 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e) // 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; } @@ -290,7 +304,7 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e) // 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); @@ -303,19 +317,22 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e) 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" } @@ -323,24 +340,20 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e) 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)); } } @@ -361,7 +374,6 @@ void race_SendTime(entity e, float cp, float t, float tvalid) 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 @@ -414,7 +426,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); + race_setTime(GetMapname(), t, e.crypto_idfp, e.netname, e, true); MUTATOR_CALLHOOK(Race_FinalCheckpoint, e); } if(t < recordtime || recordtime == 0) @@ -562,6 +574,9 @@ void dumpsurface(entity e) void checkpoint_passed(entity this, entity player) { + if(player.personal && autocvar_g_allow_checkpoints) + return; // practice mode! + string oldmsg; entity cp; @@ -713,9 +728,13 @@ void checkpoint_use(entity this, entity actor, entity trigger) bool race_waypointsprite_visible_for_player(entity this, entity player, entity view) { - if(view.race_checkpoint == -1 || this.owner.race_checkpoint == -2) + entity own = this.owner; + if(this.realowner) + own = this.realowner; // target support + + if(view.race_checkpoint == -1 || own.race_checkpoint == -2) return true; - else if(view.race_checkpoint == this.owner.race_checkpoint) + else if(view.race_checkpoint == own.race_checkpoint) return true; else return false; @@ -799,19 +818,37 @@ void trigger_race_checkpoint_verify(entity this) g_race_qualifying = qual; + IL_EACH(g_race_targets, true, + { + entity cpt = it; + FOREACH_ENTITY_STRING(target, cpt.targetname, + { + vector org = (it.absmin + it.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.realowner = cpt; + 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"));) { @@ -832,15 +869,14 @@ void trigger_race_checkpoint_verify(entity this) 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); } - } + }); } } @@ -913,9 +949,9 @@ spawnfunc(trigger_race_checkpoint) 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"; @@ -946,25 +982,36 @@ spawnfunc(trigger_race_checkpoint) 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"; @@ -980,12 +1027,7 @@ spawnfunc(target_checkpoint) // defrag entity 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); } @@ -1142,7 +1184,7 @@ float race_GetFractionalLapCount(entity e) vector o0, o1; float bestfraction, fraction; - entity lastcp, cp0, cp1; + entity lastcp; float nextcpindex, lastcpindex; nextcpindex = max(e.race_checkpoint, 0); @@ -1153,26 +1195,26 @@ float race_GetFractionalLapCount(entity e) 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