X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Frace.qc;h=ef82cc3d603c6751f6811bcdab5a75353ade2268;hb=238d04f302418c0b644c68d45e64eb05b3583f09;hp=87776d4794bca8099a766b92d709e3c51a7a5923;hpb=23c69426d613afe6baf9212e58f7ee685b76b81e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 87776d479..ef82cc3d6 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -15,6 +15,9 @@ #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) @@ -26,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); @@ -87,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)))); } @@ -244,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; @@ -264,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) @@ -272,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; } @@ -281,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; } @@ -291,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); @@ -304,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" } @@ -324,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)); } } @@ -362,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 @@ -415,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) @@ -537,34 +548,10 @@ void race_ClearTime(entity e) }); } -void dumpsurface(entity e) -{ - float n, si, ni; - vector norm, vec; - LOG_INFO("Surfaces of ", etos(e), ":\n"); - - LOG_INFO("TEST = ", ftos(getsurfacenearpoint(e, '0 0 0')), "\n"); - - for(si = 0; ; ++si) - { - n = getsurfacenumpoints(e, si); - if(n <= 0) - break; - LOG_INFO(" Surface ", ftos(si), ":\n"); - norm = getsurfacenormal(e, si); - LOG_INFO(" Normal = ", vtos(norm), "\n"); - for(ni = 0; ni < n; ++ni) - { - vec = getsurfacepoint(e, si, ni); - LOG_INFO(" Point ", ftos(ni), " = ", vtos(vec), " (", ftos(norm * vec), ")\n"); - } - } -} - void checkpoint_passed(entity this, entity player) { - string oldmsg; - entity cp; + if(player.personal && autocvar_g_allow_checkpoints) + return; // practice mode! if(player.classname == "porto") { @@ -574,6 +561,8 @@ void checkpoint_passed(entity this, entity player) return; } + string oldmsg; // used twice + /* * Trigger targets */ @@ -602,30 +591,37 @@ void checkpoint_passed(entity this, entity player) this.race_checkpoint = player.race_checkpoint; } - float largest_cp_id = 0; - float cp_amount = 0; - for(cp = NULL; (cp = find(cp, classname, "target_checkpoint"));) + int cp_amount = 0, largest_cp_id = 0; + IL_EACH(g_race_targets, it.classname == "target_checkpoint", { cp_amount += 1; - if(cp.race_checkpoint > largest_cp_id) // update the finish id if someone hit a new checkpoint + if(it.race_checkpoint > largest_cp_id) // update the finish id if someone hit a new checkpoint { - largest_cp_id = cp.race_checkpoint; - for(cp = NULL; (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; - - for(cp = NULL; (cp = find(cp, classname, "target_checkpoint"));) + if(!largest_cp_id) { - if(cp.race_checkpoint == -2) // set defragcpexists to -1 so that the cp id file will be rewritten when someone finishes - defragcpexists = -1; + IL_EACH(g_race_targets, it.classname == "target_checkpoint", + { + if(it.race_checkpoint == -2) // set defragcpexists to -1 so that the cp id file will be rewritten when someone finishes + defragcpexists = -1; + }); } + + largest_cp_id = it.race_checkpoint; + IL_EACH(g_race_targets, it.classname == "target_stopTimer", + { + it.race_checkpoint = largest_cp_id + 1; // finish line + }); + race_highest_checkpoint = largest_cp_id + 1; + race_timed_checkpoint = largest_cp_id + 1; } - } - if(cp_amount == 0) + }); + + if(!cp_amount) { - for(cp = NULL; (cp = find(cp, classname, "target_stopTimer"));) - cp.race_checkpoint = 1; + IL_EACH(g_race_targets, it.classname == "target_stopTimer", + { + it.race_checkpoint = 1; + }); race_highest_checkpoint = 1; race_timed_checkpoint = 1; } @@ -681,8 +677,10 @@ void checkpoint_passed(entity this, entity player) defragcpexists = fh = fopen(strcat("maps/", GetMapname(), ".defragcp"), FILE_WRITE); if(fh >= 0) { - for(cp = NULL; (cp = find(cp, classname, "target_checkpoint"));) - fputs(fh, strcat(cp.targetname, " ", ftos(cp.race_checkpoint), "\n")); + IL_EACH(g_race_targets, it.classname == "target_checkpoint", + { + fputs(fh, strcat(it.targetname, " ", ftos(it.race_checkpoint), "\n")); + }); } fclose(fh); } @@ -714,9 +712,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; @@ -800,19 +802,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"));) { @@ -913,9 +933,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"; @@ -972,9 +992,9 @@ spawnfunc(target_checkpoint) // defrag entity if(is_trigger) { org = (this.absmin + this.absmax) * 0.5; - tracebox(org, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), org - '0 0 1' * (org.z - this.absmin.z), MOVE_NORMAL, this); + 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 = time + 1000000000; + this.nearestwaypointtimeout = -1; } if(this.message == "") @@ -991,12 +1011,7 @@ spawnfunc(target_checkpoint) // defrag entity race_timed_checkpoint = 1; - if(this.race_checkpoint == 0) - WaypointSprite_SpawnFixed(WP_RaceStart, org, this, sprite, RADARICON_NONE); - else - WaypointSprite_SpawnFixed(WP_RaceCheckpoint, org, 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); }