edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Use character position, not view pos for 16 player compatibility mapping

Browse source
This commit is contained in:
def 2014-01-06 15:20:02 +01:00
parent 3dc996e3cc
commit 86d9d75e2d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game/server/gameworld.cpp
View file

@ -171,13 +171,13 @@ void CGameWorld::UpdatePlayerMaps()
dist[j].second = j; dist[j].second = j;
if (!Server()->ClientIngame(j)) if (!Server()->ClientIngame(j))
{ {
dist[j].first = 1e12; dist[j].first = 1e10;
continue; continue;
} }
CCharacter* ch = GameServer()->m_apPlayers[j]->GetCharacter(); CCharacter* ch = GameServer()->m_apPlayers[j]->GetCharacter();
if (!ch) if (!ch)
{ {
dist[j].first = 1e11; dist[j].first = 1e9;
continue; continue;
} }
// copypasted chunk from character.cpp Snap() follows // copypasted chunk from character.cpp Snap() follows
@ -193,11 +193,11 @@ void CGameWorld::UpdatePlayerMaps()
) )
) )
{ {
dist[j].first = 1e10; dist[j].first = 1e8;
continue; continue;
} }
dist[j].first = distance(GameServer()->m_apPlayers[i]->m_ViewPos, GameServer()->m_apPlayers[j]->m_ViewPos); dist[j].first = distance(GameServer()->m_apPlayers[i]->GetCharacter()->m_Pos, GameServer()->m_apPlayers[j]->GetCharacter()->m_Pos);
} }
// always send the player himself // always send the player himself
@ -212,7 +212,7 @@ void CGameWorld::UpdatePlayerMaps()
for (int j = 0; j < VANILLA_MAX_CLIENTS; j++) for (int j = 0; j < VANILLA_MAX_CLIENTS; j++)
{ {
if (map[j] == -1) continue; if (map[j] == -1) continue;
if (dist[map[j]].first > 5e11) map[j] = -1; if (dist[map[j]].first > 5e9) map[j] = -1;
else rMap[map[j]] = j; else rMap[map[j]] = j;
} }
@ -223,7 +223,7 @@ void CGameWorld::UpdatePlayerMaps()
for (int j = 0; j < VANILLA_MAX_CLIENTS - 1; j++) for (int j = 0; j < VANILLA_MAX_CLIENTS - 1; j++)
{ {
int k = dist[j].second; int k = dist[j].second;
if (rMap[k] != -1 || dist[j].first > 5e11) continue; if (rMap[k] != -1 || dist[j].first > 5e9) continue;
while (mapc < VANILLA_MAX_CLIENTS && map[mapc] != -1) mapc++; while (mapc < VANILLA_MAX_CLIENTS && map[mapc] != -1) mapc++;
if (mapc < VANILLA_MAX_CLIENTS - 1) if (mapc < VANILLA_MAX_CLIENTS - 1)
map[mapc] = k; map[mapc] = k;