X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Frace.qc;h=a3cbc685f2be9d3164ce3526d7932a9f962b7a54;hp=6fb39f6ce71cac1007025543fc982cbf2a9f8258;hb=fca1fc158c44eff425d73fa279900144249aca16;hpb=3e22c2d597cb7153805878681ac9db3d3c9e9e95 diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 6fb39f6ce..a3cbc685f 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -1,15 +1,15 @@ #include "race.qh" -#include "cl_client.qh" +#include "client.qh" #include "portals.qh" #include "scores.qh" #include "spawnpoints.qh" -#include "bot/waypoints.qh" -#include "bot/navigation.qh" +#include "bot/api.qh" #include "command/getreplies.qh" #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" @@ -22,7 +22,7 @@ void race_InitSpectator() race_SendNextCheckpoint(msg_entity.enemy, 1); } -void W_Porto_Fail(float failhard); +void W_Porto_Fail(entity this, float failhard); float race_readTime(string map, float pos) { @@ -264,7 +264,7 @@ 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, world, MSG_INFO, INFO_RACE_FAIL_RANKED, mynetname, player_prevpos, t, oldrec); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_FAIL_RANKED, mynetname, player_prevpos, t, oldrec); return; } else if (!newpos) @@ -272,7 +272,7 @@ 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, world, MSG_INFO, INFO_RACE_FAIL_UNRANKED, mynetname, RANKINGS_CNT, t, oldrec); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_FAIL_UNRANKED, mynetname, RANKINGS_CNT, t, oldrec); return; } @@ -281,7 +281,7 @@ 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, world, MSG_INFO, INFO_RACE_NEW_MISSING_UID, mynetname, t); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_MISSING_UID, mynetname, t); return; } @@ -304,19 +304,19 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e) if(newpos == player_prevpos) { - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_RACE_NEW_IMPROVED, mynetname, newpos, t, oldrec); + 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, world, MSG_INFO, INFO_RACE_NEW_SET, mynetname, newpos, t); + 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, world, MSG_INFO, INFO_RACE_NEW_BROKEN, mynetname, oldrec_holder, newpos, t, oldrec); + 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" } @@ -394,7 +394,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid) { e.race_completed = 1; MAKE_INDEPENDENT_PLAYER(e); - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_RACE_FINISHED, e.netname); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_FINISHED, e.netname); ClientData_Touch(e); } } @@ -457,17 +457,17 @@ void race_SendTime(entity e, float cp, float t, float tvalid) } else // RACE! Not Qualifying { - float lself, lother, othtime; + float mylaps, lother, othtime; entity oth; oth = race_checkpoint_lastplayers[cp]; if(oth) { - lself = PlayerScore_Add(e, SP_RACE_LAPS, 0); + mylaps = PlayerScore_Add(e, SP_RACE_LAPS, 0); lother = race_checkpoint_lastlaps[cp]; othtime = race_checkpoint_lasttimes[cp]; } else - lself = lother = othtime = 0; + mylaps = lother = othtime = 0; if(IS_REAL_CLIENT(e)) { @@ -485,7 +485,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid) else { WriteInt24_t(MSG_ONE, TIME_ENCODE(time - race_checkpoint_lasttimes[cp])); - WriteByte(MSG_ONE, lself - lother); + WriteByte(MSG_ONE, mylaps - lother); WriteString(MSG_ONE, oth.netname); // record holder } }); @@ -493,7 +493,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid) race_checkpoint_lastplayers[cp] = e; race_checkpoint_lasttimes[cp] = time; - race_checkpoint_lastlaps[cp] = lself; + race_checkpoint_lastlaps[cp] = mylaps; if(IS_REAL_CLIENT(oth)) { @@ -511,7 +511,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid) else { WriteInt24_t(MSG_ONE, TIME_ENCODE(time - othtime)); - WriteByte(MSG_ONE, lother - lself); + WriteByte(MSG_ONE, lother - mylaps); WriteString(MSG_ONE, e.netname); // record holder } }); @@ -525,7 +525,7 @@ void race_ClearTime(entity e) e.race_laptime = 0; e.race_movetime = e.race_movetime_frac = e.race_movetime_count = 0; e.race_penalty_accumulator = 0; - e.race_lastpenalty = world; + e.race_lastpenalty = NULL; if(!IS_REAL_CLIENT(e)) return; @@ -570,7 +570,7 @@ void checkpoint_passed(entity this, entity player) { // do not allow portalling through checkpoints trace_plane_normal = normalize(-1 * player.velocity); - WITHSELF(player, W_Porto_Fail(0)); + W_Porto_Fail(player, 0); return; } @@ -581,7 +581,7 @@ void checkpoint_passed(entity this, entity player) { oldmsg = this.message; this.message = ""; - SUB_UseTargets(this, player, player); // TODO: should we be using other for the trigger here? + SUB_UseTargets(this, player, player); this.message = oldmsg; } @@ -604,18 +604,18 @@ void checkpoint_passed(entity this, entity player) float largest_cp_id = 0; float cp_amount = 0; - for(cp = world; (cp = find(cp, classname, "target_checkpoint"));) + for(cp = NULL; (cp = find(cp, classname, "target_checkpoint"));) { cp_amount += 1; if(cp.race_checkpoint > largest_cp_id) // update the finish id if someone hit a new checkpoint { largest_cp_id = cp.race_checkpoint; - for(cp = world; (cp = find(cp, classname, "target_stopTimer"));) + 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 = world; (cp = find(cp, classname, "target_checkpoint"));) + for(cp = NULL; (cp = find(cp, classname, "target_checkpoint"));) { if(cp.race_checkpoint == -2) // set defragcpexists to -1 so that the cp id file will be rewritten when someone finishes defragcpexists = -1; @@ -624,7 +624,7 @@ void checkpoint_passed(entity this, entity player) } if(cp_amount == 0) { - for(cp = world; (cp = find(cp, classname, "target_stopTimer"));) + for(cp = NULL; (cp = find(cp, classname, "target_stopTimer"));) cp.race_checkpoint = 1; race_highest_checkpoint = 1; race_timed_checkpoint = 1; @@ -669,7 +669,7 @@ void checkpoint_passed(entity this, entity player) player.race_laptime = time; player.race_movetime = player.race_movetime_frac = player.race_movetime_count = 0; player.race_penalty_accumulator = 0; - player.race_lastpenalty = world; + player.race_lastpenalty = NULL; } if(g_race_qualifying) @@ -681,7 +681,7 @@ void checkpoint_passed(entity this, entity player) defragcpexists = fh = fopen(strcat("maps/", GetMapname(), ".defragcp"), FILE_WRITE); if(fh >= 0) { - for(cp = world; (cp = find(cp, classname, "target_checkpoint"));) + for(cp = NULL; (cp = find(cp, classname, "target_checkpoint"));) fputs(fh, strcat(cp.targetname, " ", ftos(cp.race_checkpoint), "\n")); } fclose(fh); @@ -698,10 +698,10 @@ void checkpoint_passed(entity this, entity player) } } -void checkpoint_touch() -{SELFPARAM(); - EXACTTRIGGER_TOUCH; - checkpoint_passed(this, other); +void checkpoint_touch(entity this, entity toucher) +{ + EXACTTRIGGER_TOUCH(this, toucher); + checkpoint_passed(this, toucher); } void checkpoint_use(entity this, entity actor, entity trigger) @@ -709,8 +709,7 @@ void checkpoint_use(entity this, entity actor, entity trigger) if(trigger.classname == "info_player_deathmatch") // a spawn, a spawn return; - other = actor; - checkpoint_passed(this, other); + checkpoint_passed(this, actor); } bool race_waypointsprite_visible_for_player(entity this, entity player, entity view) @@ -789,7 +788,7 @@ void trigger_race_checkpoint_verify(entity this) 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 (entity cp = world; (cp = find(cp, classname, "target_checkpoint"));) { + for (entity cp = NULL; (cp = find(cp, classname, "target_checkpoint"));) { if (argv(0) == cp.targetname) { cp.race_checkpoint = stof(argv(1)); } @@ -803,52 +802,51 @@ void trigger_race_checkpoint_verify(entity this) if (race_timed_checkpoint) { if (defrag_ents) { - for (entity cp = world; (cp = find(cp, classname, "target_startTimer"));) { + for (entity cp = NULL; (cp = find(cp, classname, "target_startTimer"));) { WaypointSprite_UpdateSprites(cp.sprite, WP_RaceStart, WP_Null, WP_Null); } - for (entity cp = world; (cp = find(cp, classname, "target_stopTimer"));) { + for (entity cp = NULL; (cp = find(cp, classname, "target_stopTimer"));) { WaypointSprite_UpdateSprites(cp.sprite, WP_RaceFinish, WP_Null, WP_Null); } - for (entity cp = world; (cp = find(cp, classname, "target_checkpoint"));) { + 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; } } if (defragcpexists != -1) { float largest_cp_id = 0; - for (entity cp = world; (cp = find(cp, classname, "target_checkpoint"));) { + for (entity cp = NULL; (cp = find(cp, classname, "target_checkpoint"));) { if (cp.race_checkpoint > largest_cp_id) { largest_cp_id = cp.race_checkpoint; } } - for (entity cp = world; (cp = find(cp, classname, "target_stopTimer"));) { + for (entity 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; } else { - for (entity cp = world; (cp = find(cp, classname, "target_stopTimer"));) { + for (entity cp = NULL; (cp = find(cp, classname, "target_stopTimer"));) { cp.race_checkpoint = 255; // finish line } race_highest_checkpoint = 255; race_timed_checkpoint = 255; } } 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) { - 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); } - } + }); } } if (defrag_ents) { - for (entity trigger = world; (trigger = find(trigger, classname, "trigger_multiple")); ) { - for (entity targ = world; (targ = find(targ, targetname, trigger.target)); ) { + for (entity trigger = NULL; (trigger = find(trigger, classname, "trigger_multiple")); ) { + for (entity targ = NULL; (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; @@ -906,16 +904,16 @@ vector trigger_race_checkpoint_spawn_evalfunc(entity this, entity player, entity spawnfunc(trigger_race_checkpoint) { vector o; - if(!g_race && !g_cts) { remove(this); return; } + if(!g_race && !g_cts) { delete(this); return; } EXACTTRIGGER_INIT; this.use = checkpoint_use; if (!(this.spawnflags & 1)) - this.touch = checkpoint_touch; + 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; @@ -948,25 +946,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) { remove(this); return; } + 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)) - this.touch = checkpoint_touch; + 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 = time + 1000000000; + } if(this.message == "") this.message = "went backwards"; @@ -983,9 +992,9 @@ spawnfunc(target_checkpoint) // defrag entity race_timed_checkpoint = 1; if(this.race_checkpoint == 0) - WaypointSprite_SpawnFixed(WP_RaceStart, o, this, sprite, RADARICON_NONE); + WaypointSprite_SpawnFixed(WP_RaceStart, org, this, sprite, RADARICON_NONE); else - WaypointSprite_SpawnFixed(WP_RaceCheckpoint, o, this, sprite, RADARICON_NONE); + WaypointSprite_SpawnFixed(WP_RaceCheckpoint, org, this, sprite, RADARICON_NONE); this.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player; @@ -1001,7 +1010,7 @@ void race_AbandonRaceCheck(entity p) { p.race_completed = 1; MAKE_INDEPENDENT_PLAYER(p); - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_RACE_ABANDONED, p.netname); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_ABANDONED, p.netname); ClientData_Touch(p); } } @@ -1018,7 +1027,7 @@ void race_PreparePlayer(entity this) this.race_place = 0; this.race_started = 0; this.race_respawn_checkpoint = 0; - this.race_respawn_spotref = world; + this.race_respawn_spotref = NULL; } void race_RetractPlayer(entity this) @@ -1032,7 +1041,7 @@ void race_RetractPlayer(entity this) spawnfunc(info_player_race) { - if(!g_race && !g_cts) { remove(this); return; } + if(!g_race && !g_cts) { delete(this); return; } ++race_spawns; spawnfunc_info_player_deathmatch(this); @@ -1043,7 +1052,7 @@ spawnfunc(info_player_race) } void race_ClearRecords() -{SELFPARAM(); +{ float i; for(i = 0; i < MAX_CHECKPOINTS; ++i) @@ -1093,13 +1102,13 @@ void race_ImposePenaltyTime(entity pl, float penalty, string reason) } } -void penalty_touch() -{SELFPARAM(); - EXACTTRIGGER_TOUCH; - if(other.race_lastpenalty != self) +void penalty_touch(entity this, entity toucher) +{ + EXACTTRIGGER_TOUCH(this, toucher); + if(toucher.race_lastpenalty != this) { - other.race_lastpenalty = self; - race_ImposePenaltyTime(other, self.race_penalty, self.race_penalty_reason); + toucher.race_lastpenalty = this; + race_ImposePenaltyTime(toucher, this.race_penalty, this.race_penalty_reason); } } @@ -1117,7 +1126,7 @@ spawnfunc(trigger_race_penalty) this.use = penalty_use; if (!(this.spawnflags & 1)) - this.touch = penalty_touch; + settouch(this, penalty_touch); if (this.race_penalty_reason == "") this.race_penalty_reason = "missing a checkpoint"; @@ -1144,7 +1153,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); @@ -1155,26 +1164,26 @@ float race_GetFractionalLapCount(entity e) return l; // finish bestfraction = 1; - for(cp0 = world; (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 = world; (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