X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Frace.qc;h=c1b272ceaffe360c9ee4b617bcc15761a28b0c8a;hb=fbd313c7ceb26a09310d8062926f4ac2468623a8;hp=03c4fa828c9e2732b61c0d301516878fd2f446ab;hpb=29ba411594428929a9e9a0e0baa620210213bec7;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 03c4fa828..c1b272cea 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -1,5 +1,7 @@ #include "race.qh" +#include +#include #include "client.qh" #include "portals.qh" #include "scores.qh" @@ -9,9 +11,10 @@ #include "../common/deathtypes/all.qh" #include "../common/notifications/all.qh" #include "../common/mapinfo.qh" +#include #include #include -#include "../common/triggers/subs.qh" +#include "../common/mapobjects/subs.qh" #include "../lib/warpzone/util_server.qh" #include "../lib/warpzone/common.qh" #include "../common/mutators/mutator/waypoints/waypointsprites.qh" @@ -221,6 +224,14 @@ void race_send_speedaward_alltimebest(float msg) WriteString(msg, speedaward_alltimebest_holder); } +void race_send_rankings_cnt(float msg) +{ + WriteHeader(msg, TE_CSQC_RACE); + WriteByte(msg, RACE_NET_RANKINGS_CNT); + int m = min(RANKINGS_CNT, autocvar_g_cts_send_rankings_cnt); + WriteByte(msg, m); +} + void race_SendRankings(float pos, float prevpos, float del, float msg) { WriteHeader(msg, TE_CSQC_RACE); @@ -313,9 +324,7 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e, } race_SendRankings(newpos, player_prevpos, 0, MSG_ALL); - if(rankings_reply) - strunzone(rankings_reply); - rankings_reply = strzone(getrankings()); + strcpy(rankings_reply, getrankings()); if(newpos == player_prevpos) { @@ -363,9 +372,7 @@ void race_deleteTime(string map, float pos) if(pos == 1) race_send_recordtime(MSG_ALL); - if(rankings_reply) - strunzone(rankings_reply); - rankings_reply = strzone(getrankings()); + strcpy(rankings_reply, getrankings()); } void race_SendTime(entity e, float cp, float t, float tvalid) @@ -384,20 +391,20 @@ void race_SendTime(entity e, float cp, float t, float tvalid) float s; if(g_race_qualifying) { - s = PlayerScore_Add(e, SP_RACE_FASTEST, 0); + s = GameRules_scoring_add(e, RACE_FASTEST, 0); if(!s || t < s) - PlayerScore_Add(e, SP_RACE_FASTEST, t - s); + GameRules_scoring_add(e, RACE_FASTEST, t - s); } else { - s = PlayerScore_Add(e, SP_RACE_FASTEST, 0); + s = GameRules_scoring_add(e, RACE_FASTEST, 0); if(!s || t < s) - PlayerScore_Add(e, SP_RACE_FASTEST, t - s); + GameRules_scoring_add(e, RACE_FASTEST, t - s); - s = PlayerScore_Add(e, SP_RACE_TIME, 0); + s = GameRules_scoring_add(e, RACE_TIME, 0); snew = TIME_ENCODE(time - game_starttime); - PlayerScore_Add(e, SP_RACE_TIME, snew - s); - l = PlayerTeamScore_Add(e, SP_RACE_LAPS, ST_RACE_LAPS, 1); + GameRules_scoring_add(e, RACE_TIME, snew - s); + l = GameRules_scoring_add_team(e, RACE_LAPS, 1); if(autocvar_fraglimit) if(l >= autocvar_fraglimit) @@ -439,11 +446,9 @@ void race_SendTime(entity e, float cp, float t, float tvalid) if(t < recordtime || recordtime == 0) { race_checkpoint_records[cp] = t; - if(race_checkpoint_recordholders[cp]) - strunzone(race_checkpoint_recordholders[cp]); - race_checkpoint_recordholders[cp] = strzone(e.netname); + strcpy(race_checkpoint_recordholders[cp], e.netname); if(g_race_qualifying) - FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it) && it.race_checkpoint == cp, LAMBDA(race_SendNextCheckpoint(it, 0))); + FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it) && it.race_checkpoint == cp, { race_SendNextCheckpoint(it, 0); }); } } @@ -483,7 +488,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid) entity oth = race_checkpoint_lastplayers[cp]; if(oth) { - mylaps = PlayerScore_Add(e, SP_RACE_LAPS, 0); + mylaps = GameRules_scoring_add(e, RACE_LAPS, 0); lother = race_checkpoint_lastlaps[cp]; othtime = race_checkpoint_lasttimes[cp]; } @@ -702,7 +707,7 @@ void checkpoint_passed(entity this, entity player) else { if(this.spawnflags & 4) - Damage (player, this, this, 10000, DEATH_HURTTRIGGER.m_id, player.origin, '0 0 0'); + Damage (player, this, this, 10000, DEATH_HURTTRIGGER.m_id, DMG_NOWEP, player.origin, '0 0 0'); } } @@ -812,8 +817,10 @@ void trigger_race_checkpoint_verify(entity this) g_race_qualifying = qual; - IL_EACH(g_race_targets, true, + IL_EACH(g_race_targets, it.classname == "target_checkpoint" || it.classname == "target_startTimer" || it.classname == "target_stopTimer", { + if(it.targetname == "" || !it.targetname) // somehow this is a case... + continue; entity cpt = it; FOREACH_ENTITY_STRING(target, cpt.targetname, { @@ -830,12 +837,15 @@ void trigger_race_checkpoint_verify(entity this) if (race_timed_checkpoint) { if (defrag_ents) { - IL_EACH(g_race_targets, true, + IL_EACH(g_race_targets, it.classname == "target_checkpoint" || it.classname == "target_startTimer" || it.classname == "target_stopTimer", { entity cpt = it; if(it.classname == "target_startTimer" || it.classname == "target_stopTimer") { + if(it.targetname == "" || !it.targetname) // somehow this is a case... + continue; FOREACH_ENTITY_STRING(target, cpt.targetname, { - WaypointSprite_UpdateSprites(it.sprite, ((cpt.classname == "target_startTimer") ? WP_RaceStart : WP_RaceFinish), WP_Null, WP_Null); + if(it.sprite) + WaypointSprite_UpdateSprites(it.sprite, ((cpt.classname == "target_startTimer") ? WP_RaceStart : WP_RaceFinish), WP_Null, WP_Null); }); } if(it.classname == "target_checkpoint") { @@ -987,7 +997,7 @@ spawnfunc(target_checkpoint) // defrag entity defrag_ents = 1; // if this is targeted, then it probably isn't a trigger - bool is_trigger = !boolean(!this.nottargeted && this.targetname != ""); + bool is_trigger = this.targetname == ""; if(is_trigger) EXACTTRIGGER_INIT; @@ -1043,7 +1053,7 @@ void race_AbandonRaceCheck(entity p) void race_StartCompleting() { race_completing = 1; - FOREACH_CLIENT(IS_PLAYER(it) && IS_DEAD(it), LAMBDA(race_AbandonRaceCheck(it))); + FOREACH_CLIENT(IS_PLAYER(it) && IS_DEAD(it), { race_AbandonRaceCheck(it); }); } void race_PreparePlayer(entity this) @@ -1081,16 +1091,14 @@ void race_ClearRecords() for(int j = 0; j < MAX_CHECKPOINTS; ++j) { race_checkpoint_records[j] = 0; - if(race_checkpoint_recordholders[j]) - strunzone(race_checkpoint_recordholders[j]); - race_checkpoint_recordholders[j] = string_null; + strfree(race_checkpoint_recordholders[j]); } - FOREACH_CLIENT(true, LAMBDA( + FOREACH_CLIENT(true, { float p = it.race_place; race_PreparePlayer(it); it.race_place = p; - )); + }); } void race_ImposePenaltyTime(entity pl, float penalty, string reason) @@ -1170,7 +1178,7 @@ float race_GetFractionalLapCount(entity e) // links on CP entities) float l; - l = PlayerScore_Add(e, SP_RACE_LAPS, 0); + l = GameRules_scoring_add(e, RACE_LAPS, 0); if(CS(e).race_completed) return l; // not fractional