steam-frame/bearstonem--openmohaa-vr
1
0 Fork 0
mirror of https://github.com/bearstonem/openmohaa-vr.git synced 2026-10-18 20:00:22 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

Fix spawn point metric functions not counting the last player

Browse Source
This commit is contained in:
smallmodel committed 2024-12-17 22:45:43 +01:00
1 parent 8dba91fbcc
commit bcbe7cd870
1 file changed
+11 -13
Download Patch File Download Diff File Expand all files Collapse all files
code/fgame/dm_manager.cpp
+11 -13
View File
@@ -130,14 +130,14 @@ static PlayerStart *GetRandomSpawnpointFromList(spawnsort_t *pSpots, int nSpots)
}
}
float SpawnpointMetric_Ffa(const float *origin, DM_Team *dmTeam, const Player *player)
float SpawnpointMetric_Ffa(const vec3_t origin, DM_Team *dmTeam, const Player *player)
{
float fMinEnemyDistSquared = 23170.0f * 23170.0f;
float fMinEnemyDistSquared = Square(23170);
int i;
int nPlayers = dmManager.PlayerCount();
float fDist;
for (i = 1; i < nPlayers; i++) {
for (i = 1; i <= nPlayers; i++) {
Player *teammate = dmManager.GetPlayer(i);
if (teammate == player || teammate->IsDead() || teammate->IsSpectator()) {
continue;
@@ -150,12 +150,12 @@ float SpawnpointMetric_Ffa(const float *origin, DM_Team *dmTeam, const Player *p
}
}
return fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * (1024.0f * 1024.0f);
return fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * Square(1024);
}
float SpawnpointMetric_Team(const float *origin, DM_Team *dmTeam, const Player *player)
float SpawnpointMetric_Team(const vec3_t origin, DM_Team *dmTeam, const Player *player)
{
float fMinEnemyDistSquared = 23170.0f * 23170.0f;
float fMinEnemyDistSquared = Square(23170);
float fSumFriendDistSquared = 0.0f;
float fDistSquared;
float fMetric;
@@ -163,7 +163,7 @@ float SpawnpointMetric_Team(const float *origin, DM_Team *dmTeam, const Player *
int nPlayers = dmManager.PlayerCount();
int nFriends = 0;
for (i = 1; i < nPlayers; i++) {
for (i = 1; i <= nPlayers; i++) {
Player *teammate = dmManager.GetPlayer(i);
if (teammate == player || teammate->IsDead() || teammate->IsSpectator()) {
continue;
@@ -174,14 +174,12 @@ float SpawnpointMetric_Team(const float *origin, DM_Team *dmTeam, const Player *
if (teammate->GetDM_Team() == dmTeam) {
nFriends++;
fSumFriendDistSquared += fDistSquared;
} else {
if (fMinEnemyDistSquared > fDistSquared) {
fMinEnemyDistSquared = fDistSquared;
}
} else if (fMinEnemyDistSquared > fDistSquared) {
fMinEnemyDistSquared = fDistSquared;
}
}
fMetric = fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * (1024.0f * 1024.0f);
fMetric = fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * Square(1024);
if (nFriends) {
fMetric += 0.25f * ((23170.0f * 23170.0f) - fSumFriendDistSquared / nFriends);
@@ -190,7 +188,7 @@ float SpawnpointMetric_Team(const float *origin, DM_Team *dmTeam, const Player *
return fMetric;
}
float SpawnpointMetric_Objective(const float *origin, DM_Team *dmTeam, const Player *player)
float SpawnpointMetric_Objective(const vec3_t origin, DM_Team *dmTeam, const Player *player)
{
return rand() * 0.0000000005f;
}