X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fspawnpoints.qc;h=5aa81a2a73b0e9ad3fae1304237f863e71c9a2ed;hb=65fc9d516200f4df289b42e1595e91baf7878331;hp=f4dfe0432022927095c423f578b4599e58bfe27d;hpb=393022c0e9b00481e68d1db786e96e4ffb7f37e0;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index f4dfe0432..5aa81a2a7 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -1,23 +1,26 @@ #include "spawnpoints.qh" -#include "mutators/_mod.qh" +#include #include "g_world.qh" #include "race.qh" +#include "defs.qh" #include "../common/constants.qh" +#include #include "../common/teams.qh" -#include "../common/triggers/subs.qh" +#include +#include "../common/mapobjects/subs.qh" +#include "../common/mapobjects/target/spawnpoint.qh" #include "../common/util.qh" #include "../lib/warpzone/common.qh" #include "../lib/warpzone/util_server.qh" +#include bool SpawnPoint_Send(entity this, entity to, int sf) { WriteHeader(MSG_ENTITY, ENT_CLIENT_SPAWNPOINT); WriteByte(MSG_ENTITY, this.team); - WriteCoord(MSG_ENTITY, this.origin.x); - WriteCoord(MSG_ENTITY, this.origin.y); - WriteCoord(MSG_ENTITY, this.origin.z); + WriteVector(MSG_ENTITY, this.origin); return true; } @@ -31,9 +34,7 @@ bool SpawnEvent_Send(entity this, entity to, int sf) if(autocvar_g_spawn_alloweffects) { WriteByte(MSG_ENTITY, etof(this.owner)); - WriteCoord(MSG_ENTITY, this.owner.origin.x); - WriteCoord(MSG_ENTITY, this.owner.origin.y); - WriteCoord(MSG_ENTITY, this.owner.origin.z); + WriteVector(MSG_ENTITY, this.owner.origin); send = true; } else if((to == this.owner) || (IS_SPEC(to) && (to.enemy == this.owner)) ) @@ -63,7 +64,7 @@ void spawnpoint_use(entity this, entity actor, entity trigger) if(have_team_spawns > 0) { this.team = actor.team; - some_spawn_has_been_used = 1; + some_spawn_has_been_used = true; } //LOG_INFO("spawnpoint was used!\n"); } @@ -82,14 +83,15 @@ void relocate_spawnpoint(entity this) this.maxs = PL_MAX_CONST; if (!move_out_of_solid(this)) objerror(this, "could not get out of solid at all!"); - LOG_INFO("^1NOTE: this map needs FIXING. Spawnpoint at ", vtos(o - '0 0 1')); - LOG_INFO(" needs to be moved out of solid, e.g. by '", ftos(this.origin.x - o.x)); - LOG_INFO(" ", ftos(this.origin.y - o.y)); - LOG_INFO(" ", ftos(this.origin.z - o.z), "'\n"); + LOG_INFOF( + "^1NOTE: this map needs FIXING. Spawnpoint at %s needs to be moved out of solid, e.g. by %s", + vtos(o - '0 0 1'), + vtos(this.origin - o) + ); if (autocvar_g_spawnpoints_auto_move_out_of_solid) { if (!spawnpoint_nag) - LOG_INFO("\{1}^1NOTE: this map needs FIXING (it contains spawnpoints in solid, see server log)\n"); + LOG_INFO("\{1}^1NOTE: this map needs FIXING (it contains spawnpoints in solid, see server log)"); spawnpoint_nag = 1; } else @@ -105,20 +107,22 @@ void relocate_spawnpoint(entity this) setthink(this, spawnpoint_think); this.nextthink = time + 0.5 + random() * 2; // shouldn't need it for a little second this.team_saved = this.team; + IL_PUSH(g_saved_team, this); if (!this.cnt) this.cnt = 1; if (have_team_spawns != 0) if (this.team) have_team_spawns = 1; - have_team_spawns_forteam[this.team] = 1; + have_team_spawns_forteams |= BIT(this.team); if (autocvar_r_showbboxes) { // show where spawnpoints point at too - makevectors(this.angles); + vector forward, right, up; + MAKE_VECTORS(this.angles, forward, right, up); entity e = new(info_player_foo); - setorigin(e, this.origin + v_forward * 24); + setorigin(e, this.origin + forward * 24); setsize(e, '-8 -8 -8', '8 8 8'); e.solid = SOLID_TRIGGER; } @@ -213,11 +217,6 @@ spawnfunc(info_player_team4) // _y: weight vector Spawn_Score(entity this, entity spot, float mindist, float teamcheck) { - float shortest, thisdist; - float prio; - - prio = 0; - // filter out spots for the wrong team if(teamcheck >= 0) if(spot.team != teamcheck) @@ -238,19 +237,20 @@ vector Spawn_Score(entity this, entity spot, float mindist, float teamcheck) return '-1 0 0'; } - shortest = vlen(world.maxs - world.mins); - FOREACH_CLIENT(IS_PLAYER(it) && it != this, LAMBDA( - thisdist = vlen(it.origin - spot.origin); + float prio = 0; + float shortest = vlen(world.maxs - world.mins); + FOREACH_CLIENT(IS_PLAYER(it) && it != this, { + float thisdist = vlen(it.origin - spot.origin); if (thisdist < shortest) shortest = thisdist; - )); + }); if(shortest > mindist) prio += SPAWN_PRIO_GOOD_DISTANCE; vector spawn_score = prio * '1 0 0' + shortest * '0 1 0'; // filter out spots for assault - if(spot.target != "") + if(spot.target && spot.target != "") { int found = 0; for(entity targ = findchain(targetname, spot.target); targ; targ = targ.chain) @@ -264,7 +264,7 @@ vector Spawn_Score(entity this, entity spot, float mindist, float teamcheck) } } - if(!found) + if(!found && !g_cts) { LOG_TRACE("WARNING: spawnpoint at ", vtos(spot.origin), " could not find its target ", spot.target); return '-1 0 0'; @@ -317,7 +317,7 @@ entity Spawn_WeightedPoint(entity firstspot, float lower, float upper, float exp RandomSelection_Init(); for(spot = firstspot; spot; spot = spot.chain) - RandomSelection_Add(spot, 0, string_null, pow(bound(lower, spot.spawnpoint_score.y, upper), exponent) * spot.cnt, (spot.spawnpoint_score.y >= lower) * 0.5 + spot.spawnpoint_score.x); + RandomSelection_AddEnt(spot, (bound(lower, spot.spawnpoint_score.y, upper) ** exponent) * spot.cnt, (spot.spawnpoint_score.y >= lower) * 0.5 + spot.spawnpoint_score.x); return RandomSelection_chosen_ent; } @@ -329,24 +329,34 @@ SelectSpawnPoint Finds a point to respawn ============= */ +bool testspawn_checked; +entity testspawn_point; entity SelectSpawnPoint(entity this, bool anypoint) { float teamcheck; - entity spot, firstspot; + entity spot = NULL; - spot = find (NULL, classname, "testplayerstart"); - if (spot) - return spot; + if(!testspawn_checked) + { + testspawn_point = find(NULL, classname, "testplayerstart"); + testspawn_checked = true; + } + + if(testspawn_point) + return testspawn_point; + + if(this.spawnpoint_targ) + return this.spawnpoint_targ; if(anypoint || autocvar_g_spawn_useallspawns) teamcheck = -1; else if(have_team_spawns > 0) { - if(have_team_spawns_forteam[this.team] == 0) + if(!(have_team_spawns_forteams & BIT(this.team))) { // we request a spawn for a team, and we have team // spawns, but that team has no spawns? - if(have_team_spawns_forteam[0]) + if(have_team_spawns_forteams & BIT(0)) // try noteam spawns teamcheck = 0; else @@ -356,7 +366,7 @@ entity SelectSpawnPoint(entity this, bool anypoint) else teamcheck = this.team; // MUST be team } - else if(have_team_spawns == 0 && have_team_spawns_forteam[0]) + else if(have_team_spawns == 0 && (have_team_spawns_forteams & BIT(0))) teamcheck = 0; // MUST be noteam else teamcheck = -1; @@ -364,7 +374,16 @@ entity SelectSpawnPoint(entity this, bool anypoint) // get the entire list of spots - firstspot = findchain(classname, "info_player_deathmatch"); + //entity firstspot = findchain(classname, "info_player_deathmatch"); + entity firstspot = IL_FIRST(g_spawnpoints); + entity prev = NULL; + IL_EACH(g_spawnpoints, true, + { + if(prev) + prev.chain = it; + it.chain = NULL; + prev = it; + }); // filter out the bad ones // (note this returns the original list if none survived) if(anypoint)