yquake2/zaero
0
0
Fork 0
mirror of https://github.com/yquake2/zaero.git synced 2024-11-22 03:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

coop spawnpoint fix from other addons

Browse source
This commit is contained in:
Daniel Gibson 2016-02-20 20:29:38 +01:00
parent 2bcbd86a61
commit b0f4627044
1 changed files with 53 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/player/client.c
View file

@ -50,39 +50,7 @@ void SP_FixCoopSpots (edict_t *self)
void SP_CreateCoopSpots (edict_t *self) void SP_CreateCoopSpots (edict_t *self)
{ {
edict_t *spot; // nothing, currently
if(Q_stricmp(level.mapname, "security") == 0)
{
spot = G_Spawn();
spot->classname = "info_player_coop";
spot->spawnflags2 = 0;
spot->s.origin[0] = 188 - 64;
spot->s.origin[1] = -164;
spot->s.origin[2] = 80;
spot->targetname = "jail3";
spot->s.angles[1] = 90;
spot = G_Spawn();
spot->classname = "info_player_coop";
spot->spawnflags2 = 0;
spot->s.origin[0] = 188 + 64;
spot->s.origin[1] = -164;
spot->s.origin[2] = 80;
spot->targetname = "jail3";
spot->s.angles[1] = 90;
spot = G_Spawn();
spot->classname = "info_player_coop";
spot->spawnflags2 = 0;
spot->s.origin[0] = 188 + 128;
spot->s.origin[1] = -164;
spot->s.origin[2] = 80;
spot->targetname = "jail3";
spot->s.angles[1] = 90;
return;
}
} }
@ -897,6 +865,11 @@ edict_t *SelectCoopSpawnPoint (edict_t *ent)
edict_t *spot = NULL; edict_t *spot = NULL;
char *target; char *target;
if (!ent)
{
return NULL;
}
index = ent->client - game.clients; index = ent->client - game.clients;
// player 0 starts in normal player spawn point // player 0 starts in normal player spawn point
@ -938,6 +911,15 @@ Chooses a player start, deathmatch start, coop start, etc
void SelectSpawnPoint (edict_t *ent, vec3_t origin, vec3_t angles) void SelectSpawnPoint (edict_t *ent, vec3_t origin, vec3_t angles)
{ {
edict_t *spot = NULL; edict_t *spot = NULL;
edict_t *coopspot = NULL;
int index;
int counter = 0;
vec3_t d;
if (!ent)
{
return;
}
if (deathmatch->value) if (deathmatch->value)
spot = SelectDeathmatchSpawnPoint (); spot = SelectDeathmatchSpawnPoint ();
@ -970,6 +952,44 @@ void SelectSpawnPoint (edict_t *ent, vec3_t origin, vec3_t angles)
} }
} }
/* If we are in coop and we didn't find a coop
spawnpoint due to map bugs (not correctly
connected or the map was loaded via console
and thus no previously map is known to the
client) use one in 550 units radius. */
if (coop->value)
{
index = ent->client - game.clients;
if (Q_stricmp(spot->classname, "info_player_start") == 0 && index != 0)
{
while(counter < 3)
{
coopspot = G_Find(coopspot, FOFS(classname), "info_player_coop");
if (!coopspot)
{
break;
}
VectorSubtract(coopspot->s.origin, spot->s.origin, d);
if ((VectorLength(d) < 550))
{
if (index == counter)
{
spot = coopspot;
break;
}
else
{
counter++;
}
}
}
}
}
VectorCopy (spot->s.origin, origin); VectorCopy (spot->s.origin, origin);
origin[2] += 9; origin[2] += 9;
VectorCopy (spot->s.angles, angles); VectorCopy (spot->s.angles, angles);