#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.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)
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)
{
- 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))));
}
if(!spec)
msg_entity = e;
- WRITESPECTATABLE_MSG_ONE({
+ WRITESPECTATABLE_MSG_ONE(msg_entity, {
WriteHeader(MSG_ONE, TE_CSQC_RACE);
if(spec)
{
else
msg = MSG_ALL;
msg_entity = e;
- WRITESPECTATABLE_MSG_ONE_VARNAME(dummy3, {
+ WRITESPECTATABLE_MSG_ONE(msg_entity, {
WriteHeader(msg, TE_CSQC_RACE);
WriteByte(msg, RACE_NET_SERVER_STATUS);
WriteShort(msg, id);
});
}
-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, world, 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, world, 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, world, 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, world, 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, world, 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, world, 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
{
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);
}
}
{
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)
msg_entity = e;
if(g_race_qualifying)
{
- WRITESPECTATABLE_MSG_ONE_VARNAME(dummy1, {
+ 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
}
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))
{
msg_entity = e;
- WRITESPECTATABLE_MSG_ONE_VARNAME(dummy2, {
+ 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
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
}
});
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))
{
msg_entity = oth;
- WRITESPECTATABLE_MSG_ONE_VARNAME(dummy3, {
+ 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
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
}
});
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;
msg_entity = e;
- WRITESPECTATABLE_MSG_ONE({
+ WRITESPECTATABLE_MSG_ONE(msg_entity, {
WriteHeader(MSG_ONE, TE_CSQC_RACE);
WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_CLEAR); // next
});
}
}
-void checkpoint_passed()
-{SELFPARAM();
+void checkpoint_passed(entity this, entity player)
+{
+ if(player.personal && autocvar_g_allow_checkpoints)
+ return; // practice mode!
+
string oldmsg;
entity cp;
- if(other.classname == "porto")
+ if(player.classname == "porto")
{
// do not allow portalling through checkpoints
- trace_plane_normal = normalize(-1 * other.velocity);
- setself(other);
- W_Porto_Fail(0);
+ trace_plane_normal = normalize(-1 * player.velocity);
+ W_Porto_Fail(player, 0);
return;
}
/*
* Trigger targets
*/
- if (!((self.spawnflags & 2) && (IS_PLAYER(other))))
+ if (!((this.spawnflags & 2) && (IS_PLAYER(player))))
{
- activator = other;
- oldmsg = self.message;
- self.message = "";
- SUB_UseTargets();
- self.message = oldmsg;
+ oldmsg = this.message;
+ this.message = "";
+ SUB_UseTargets(this, player, player);
+ this.message = oldmsg;
}
- if (!IS_PLAYER(other))
+ if (!IS_PLAYER(player))
return;
/*
* Remove unauthorized equipment
*/
- Portal_ClearAll(other);
+ Portal_ClearAll(player);
- other.porto_forbidden = 2; // decreased by 1 each StartFrame
+ player.porto_forbidden = 2; // decreased by 1 each StartFrame
if(defrag_ents)
{
- if(self.race_checkpoint == -2)
+ if(this.race_checkpoint == -2)
{
- self.race_checkpoint = other.race_checkpoint;
+ this.race_checkpoint = player.race_checkpoint;
}
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;
}
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;
}
}
- if((other.race_checkpoint == -1 && self.race_checkpoint == 0) || (other.race_checkpoint == self.race_checkpoint))
+ if((player.race_checkpoint == -1 && this.race_checkpoint == 0) || (player.race_checkpoint == this.race_checkpoint))
{
- if(self.race_penalty)
+ if(this.race_penalty)
{
- if(other.race_lastpenalty != self)
+ if(player.race_lastpenalty != this)
{
- other.race_lastpenalty = self;
- race_ImposePenaltyTime(other, self.race_penalty, self.race_penalty_reason);
+ player.race_lastpenalty = this;
+ race_ImposePenaltyTime(player, this.race_penalty, this.race_penalty_reason);
}
}
- if(other.race_penalty)
+ if(player.race_penalty)
return;
/*
* Trigger targets
*/
- if(self.spawnflags & 2)
+ if(this.spawnflags & 2)
{
- activator = other;
- oldmsg = self.message;
- self.message = "";
- SUB_UseTargets();
- self.message = oldmsg;
+ oldmsg = this.message;
+ this.message = "";
+ SUB_UseTargets(this, player, player); // TODO: should we be using other for the trigger here?
+ this.message = oldmsg;
}
- if(other.race_respawn_checkpoint != self.race_checkpoint || !other.race_started)
- other.race_respawn_spotref = self; // this is not a spot but a CP, but spawnpoint selection will deal with that
- other.race_respawn_checkpoint = self.race_checkpoint;
- other.race_checkpoint = race_NextCheckpoint(self.race_checkpoint);
- other.race_started = 1;
+ if(player.race_respawn_checkpoint != this.race_checkpoint || !player.race_started)
+ player.race_respawn_spotref = this; // this is not a spot but a CP, but spawnpoint selection will deal with that
+ player.race_respawn_checkpoint = this.race_checkpoint;
+ player.race_checkpoint = race_NextCheckpoint(this.race_checkpoint);
+ player.race_started = 1;
- race_SendTime(other, self.race_checkpoint, other.race_movetime, boolean(other.race_laptime));
+ race_SendTime(player, this.race_checkpoint, player.race_movetime, boolean(player.race_laptime));
- if(!self.race_checkpoint) // start line
+ if(!this.race_checkpoint) // start line
{
- other.race_laptime = time;
- other.race_movetime = other.race_movetime_frac = other.race_movetime_count = 0;
- other.race_penalty_accumulator = 0;
- other.race_lastpenalty = world;
+ player.race_laptime = time;
+ player.race_movetime = player.race_movetime_frac = player.race_movetime_count = 0;
+ player.race_penalty_accumulator = 0;
+ player.race_lastpenalty = NULL;
}
if(g_race_qualifying)
- race_SendNextCheckpoint(other, 0);
+ race_SendNextCheckpoint(player, 0);
- if(defrag_ents && defragcpexists < 0 && self.classname == "target_stopTimer")
+ if(defrag_ents && defragcpexists < 0 && this.classname == "target_stopTimer")
{
float fh;
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);
}
}
- else if(other.race_checkpoint == race_NextCheckpoint(self.race_checkpoint))
+ else if(player.race_checkpoint == race_NextCheckpoint(this.race_checkpoint))
{
// ignored
}
else
{
- if(self.spawnflags & 4)
- Damage (other, self, self, 10000, DEATH_HURTTRIGGER.m_id, other.origin, '0 0 0');
+ if(this.spawnflags & 4)
+ Damage (player, this, this, 10000, DEATH_HURTTRIGGER.m_id, player.origin, '0 0 0');
}
}
-void checkpoint_touch()
+void checkpoint_touch(entity this, entity toucher)
{
- EXACTTRIGGER_TOUCH;
- checkpoint_passed();
+ EXACTTRIGGER_TOUCH(this, toucher);
+ checkpoint_passed(this, toucher);
}
-void checkpoint_use()
+void checkpoint_use(entity this, entity actor, entity trigger)
{
- if(other.classname == "info_player_deathmatch") // a spawn, a spawn
+ if(trigger.classname == "info_player_deathmatch") // a spawn, a spawn
return;
- other = activator;
- checkpoint_passed();
+ checkpoint_passed(this, actor);
}
-float race_waypointsprite_visible_for_player(entity e)
-{SELFPARAM();
- if(e.race_checkpoint == -1 || self.owner.race_checkpoint == -2)
+bool race_waypointsprite_visible_for_player(entity this, entity player, entity view)
+{
+ if(view.race_checkpoint == -1 || this.owner.race_checkpoint == -2)
return true;
- else if(e.race_checkpoint == self.owner.race_checkpoint)
+ else if(view.race_checkpoint == this.owner.race_checkpoint)
return true;
else
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 = STR_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(this, 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(this, 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(this, 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(this, 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;
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 = NULL; (cp = find(cp, classname, "target_checkpoint"));) {
+ if (argv(0) == cp.targetname) {
cp.race_checkpoint = stof(argv(1));
+ }
+ }
}
fclose(fh);
}
g_race_qualifying = qual;
- if(race_timed_checkpoint)
+ IL_EACH(g_race_targets, true,
{
- if(defrag_ents)
+ entity cpt = it;
+ FOREACH_ENTITY_STRING(target, cpt.targetname,
{
- for(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"));)
- WaypointSprite_UpdateSprites(cp.sprite, WP_RaceFinish, WP_Null, WP_Null);
+ 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);
- 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
- defragcpexists = -1;
- }
+ it.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player;
+ });
+ });
- if(defragcpexists != -1)
+ if (race_timed_checkpoint) {
+ if (defrag_ents) {
+ 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(cp = world; (cp = find(cp, classname, "target_checkpoint"));)
- if(cp.race_checkpoint > largest_cp_id)
+ for (entity cp = NULL; (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 = 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(cp = world; (cp = find(cp, classname, "target_stopTimer"));)
+ } else {
+ 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(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);
+ } else {
+ 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)
- {
- 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 = 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;
targ.wait = 0;
//setorigin(targ, trigger.origin);
//remove(trigger);
}
+ }
+ }
}
- remove(self);
- setself(this);
}
-vector trigger_race_checkpoint_spawn_evalfunc(entity player, entity spot, vector current)
-{SELFPARAM();
+vector trigger_race_checkpoint_spawn_evalfunc(entity this, entity player, entity spot, vector current)
+{
if(g_race_qualifying)
{
// spawn at first
- if(self.race_checkpoint != 0)
+ if(this.race_checkpoint != 0)
return '-1 0 0';
if(spot.race_place != race_lowest_place_spawn)
return '-1 0 0';
}
else
{
- if(self.race_checkpoint != player.race_respawn_checkpoint)
+ if(this.race_checkpoint != player.race_respawn_checkpoint)
return '-1 0 0';
// try reusing the previous spawn
- if(self == player.race_respawn_spotref || spot == player.race_respawn_spotref)
+ if(this == player.race_respawn_spotref || spot == player.race_respawn_spotref)
current.x += SPAWN_PRIO_RACE_PREVIOUS_SPAWN;
- if(self.race_checkpoint == 0)
+ if(this.race_checkpoint == 0)
{
- float pl;
- pl = player.race_place;
+ int pl = player.race_place;
if(pl > race_highest_place_spawn)
pl = 0;
if(pl == 0 && !player.race_started)
spawnfunc(trigger_race_checkpoint)
{
vector o;
- if(!g_race && !g_cts) { remove(self); return; }
+ if(!g_race && !g_cts) { delete(this); return; }
EXACTTRIGGER_INIT;
- self.use = checkpoint_use;
- if (!(self.spawnflags & 1))
- self.touch = checkpoint_touch;
+ this.use = checkpoint_use;
+ if (!(this.spawnflags & 1))
+ settouch(this, 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);
- waypoint_spawnforitem_force(self, trace_endpos);
- self.nearestwaypointtimeout = time + 1000000000;
+ o = (this.absmin + this.absmax) * 0.5;
+ 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 = -1;
- if(self.message == "")
- self.message = "went backwards";
- if (self.message2 == "")
- self.message2 = "was pushed backwards by";
- if (self.race_penalty_reason == "")
- self.race_penalty_reason = "missing a checkpoint";
+ if(this.message == "")
+ this.message = "went backwards";
+ if (this.message2 == "")
+ this.message2 = "was pushed backwards by";
+ if (this.race_penalty_reason == "")
+ this.race_penalty_reason = "missing a checkpoint";
- self.race_checkpoint = self.cnt;
+ this.race_checkpoint = this.cnt;
- if(self.race_checkpoint > race_highest_checkpoint)
+ if(this.race_checkpoint > race_highest_checkpoint)
{
- race_highest_checkpoint = self.race_checkpoint;
- if(self.spawnflags & 8)
- race_timed_checkpoint = self.race_checkpoint;
+ race_highest_checkpoint = this.race_checkpoint;
+ if(this.spawnflags & 8)
+ race_timed_checkpoint = this.race_checkpoint;
else
race_timed_checkpoint = 0;
}
- if(!self.race_penalty)
+ if(!this.race_penalty)
{
- if(self.race_checkpoint)
- WaypointSprite_SpawnFixed(WP_RaceCheckpoint, o, self, sprite, RADARICON_NONE);
+ if(this.race_checkpoint)
+ WaypointSprite_SpawnFixed(WP_RaceCheckpoint, o, this, sprite, RADARICON_NONE);
else
- WaypointSprite_SpawnFixed(WP_RaceStartFinish, o, self, sprite, RADARICON_NONE);
+ WaypointSprite_SpawnFixed(WP_RaceStartFinish, o, this, sprite, RADARICON_NONE);
}
- self.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player;
- self.spawn_evalfunc = trigger_race_checkpoint_spawn_evalfunc;
+ this.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player;
+ this.spawn_evalfunc = trigger_race_checkpoint_spawn_evalfunc;
- InitializeEntity(self, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET);
+ 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(self); 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 != "");
- self.use = checkpoint_use;
- if (!(self.spawnflags & 1))
- self.touch = checkpoint_touch;
+ if(is_trigger)
+ EXACTTRIGGER_INIT;
- 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);
- waypoint_spawnforitem_force(self, trace_endpos);
- self.nearestwaypointtimeout = time + 1000000000;
+ this.use = checkpoint_use;
+ if (is_trigger && !(this.spawnflags & 1))
+ settouch(this, checkpoint_touch);
- if(self.message == "")
- self.message = "went backwards";
- if (self.message2 == "")
- self.message2 = "was pushed backwards by";
- if (self.race_penalty_reason == "")
- self.race_penalty_reason = "missing a checkpoint";
+ vector org = this.origin;
- if(self.classname == "target_startTimer")
- self.race_checkpoint = 0;
- else
- self.race_checkpoint = -2;
+ // 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;
+ }
- race_timed_checkpoint = 1;
+ if(this.message == "")
+ this.message = "went backwards";
+ if (this.message2 == "")
+ this.message2 = "was pushed backwards by";
+ if (this.race_penalty_reason == "")
+ this.race_penalty_reason = "missing a checkpoint";
- if(self.race_checkpoint == 0)
- WaypointSprite_SpawnFixed(WP_RaceStart, o, self, sprite, RADARICON_NONE);
+ if(this.classname == "target_startTimer")
+ this.race_checkpoint = 0;
else
- WaypointSprite_SpawnFixed(WP_RaceCheckpoint, o, self, sprite, RADARICON_NONE);
+ this.race_checkpoint = -2;
+
+ race_timed_checkpoint = 1;
- self.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player;
+ IL_PUSH(g_race_targets, this);
- InitializeEntity(self, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET);
+ InitializeEntity(this, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET);
}
spawnfunc(target_startTimer) { spawnfunc_target_checkpoint(this); }
{
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);
}
}
void race_StartCompleting()
{
race_completing = 1;
- FOREACH_CLIENT(IS_PLAYER(it) && it.deadflag != DEAD_NO, LAMBDA(race_AbandonRaceCheck(it)));
+ FOREACH_CLIENT(IS_PLAYER(it) && IS_DEAD(it), LAMBDA(race_AbandonRaceCheck(it)));
}
-void race_PreparePlayer()
-{SELFPARAM();
- race_ClearTime(self);
- self.race_place = 0;
- self.race_started = 0;
- self.race_respawn_checkpoint = 0;
- self.race_respawn_spotref = world;
+void race_PreparePlayer(entity this)
+{
+ race_ClearTime(this);
+ this.race_place = 0;
+ this.race_started = 0;
+ this.race_respawn_checkpoint = 0;
+ this.race_respawn_spotref = NULL;
}
-void race_RetractPlayer()
-{SELFPARAM();
+void race_RetractPlayer(entity this)
+{
if(!g_race && !g_cts)
return;
- if(self.race_respawn_checkpoint == 0 || self.race_respawn_checkpoint == race_timed_checkpoint)
- race_ClearTime(self);
- self.race_checkpoint = self.race_respawn_checkpoint;
+ if(this.race_respawn_checkpoint == 0 || this.race_respawn_checkpoint == race_timed_checkpoint)
+ race_ClearTime(this);
+ this.race_checkpoint = this.race_respawn_checkpoint;
}
spawnfunc(info_player_race)
{
- if(!g_race && !g_cts) { remove(self); return; }
+ if(!g_race && !g_cts) { delete(this); return; }
++race_spawns;
spawnfunc_info_player_deathmatch(this);
- if(self.race_place > race_highest_place_spawn)
- race_highest_place_spawn = self.race_place;
- if(self.race_place < race_lowest_place_spawn)
- race_lowest_place_spawn = self.race_place;
+ if(this.race_place > race_highest_place_spawn)
+ race_highest_place_spawn = this.race_place;
+ if(this.race_place < race_lowest_place_spawn)
+ race_lowest_place_spawn = this.race_place;
}
void race_ClearRecords()
-{SELFPARAM();
+{
float i;
for(i = 0; i < MAX_CHECKPOINTS; ++i)
FOREACH_CLIENT(true, LAMBDA(
float p = it.race_place;
- WITH(entity, self, it, race_PreparePlayer());
+ race_PreparePlayer(it);
it.race_place = p;
));
}
if(IS_REAL_CLIENT(pl))
{
msg_entity = pl;
- WRITESPECTATABLE_MSG_ONE({
+ WRITESPECTATABLE_MSG_ONE(msg_entity, {
WriteHeader(MSG_ONE, TE_CSQC_RACE);
WriteByte(MSG_ONE, RACE_NET_PENALTY_QUALIFYING);
WriteShort(MSG_ONE, TIME_ENCODE(penalty));
if(IS_REAL_CLIENT(pl))
{
msg_entity = pl;
- WRITESPECTATABLE_MSG_ONE_VARNAME(dummy, {
+ WRITESPECTATABLE_MSG_ONE(msg_entity, {
WriteHeader(MSG_ONE, TE_CSQC_RACE);
WriteByte(MSG_ONE, RACE_NET_PENALTY_RACE);
WriteShort(MSG_ONE, TIME_ENCODE(penalty));
}
}
-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);
}
}
-void penalty_use()
-{SELFPARAM();
- race_ImposePenaltyTime(activator, self.race_penalty, self.race_penalty_reason);
+void penalty_use(entity this, entity actor, entity trigger)
+{
+ race_ImposePenaltyTime(actor, this.race_penalty, this.race_penalty_reason);
}
spawnfunc(trigger_race_penalty)
{
// TODO: find out why this wasnt done:
- //if(!g_cts && !g_race) { remove(self); return; }
+ //if(!g_cts && !g_race) { remove(this); return; }
EXACTTRIGGER_INIT;
- self.use = penalty_use;
- if (!(self.spawnflags & 1))
- self.touch = penalty_touch;
+ this.use = penalty_use;
+ if (!(this.spawnflags & 1))
+ settouch(this, penalty_touch);
- if (self.race_penalty_reason == "")
- self.race_penalty_reason = "missing a checkpoint";
- if (!self.race_penalty)
- self.race_penalty = 5;
+ if (this.race_penalty_reason == "")
+ this.race_penalty_reason = "missing a checkpoint";
+ if (!this.race_penalty)
+ this.race_penalty = 5;
}
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);
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
projects / xonotic / xonotic-data.pk3dir.git / blobdiff