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

Hopefully fix 64 players

Browse source
This commit is contained in:
def 2014-01-02 01:56:09 +01:00
parent 0f251a435b
commit 28980ef2ba
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
datasrc/network.py
View file

@ -343,10 +343,6 @@ Messages = [
NetMessage("Cl_IsDDRace", []),
NetMessage("Cl_ShowOthers", [
NetBool("m_Show"),
]),
NetMessage("Sv_DDRaceTime", [
NetIntAny("m_Time"),
NetIntAny("m_Check"),
@ -382,5 +378,9 @@ Messages = [
NetIntAny("m_Tee15"),
]),
NetMessage("Cl_ShowOthers", [
NetBool("m_Show"),
]),
NetMessage("Cl_IsDDRace64", []),
]

2
src/game/server/entities/dragger.cpp
View file

@ -34,7 +34,7 @@ void CDragger::Move()
return;
CCharacter *Ents[MAX_CLIENTS];
int Num = GameServer()->m_World.FindEntities(m_Pos, LENGTH,
(CEntity**) Ents, 16, CGameWorld::ENTTYPE_CHARACTER);
(CEntity**) Ents, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
int Id = -1;
int MinLen = 0;
for (int i = 0; i < Num; i++)

2
src/game/server/entities/gun.cpp
View file

@ -36,7 +36,7 @@ void CGun::Fire()
}
int Num = -1;
Num = GameServer()->m_World.FindEntities(m_Pos, g_Config.m_SvPlasmaRange, (CEntity**)Ents, 16, CGameWorld::ENTTYPE_CHARACTER);
Num = GameServer()->m_World.FindEntities(m_Pos, g_Config.m_SvPlasmaRange, (CEntity**)Ents, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
for (int i = 0; i < Num; i++)
{

2
src/game/server/entities/pickup.cpp
View file

@ -48,7 +48,7 @@ void CPickup::Tick()
}*/
// Check if a player intersected us
CCharacter *apEnts[MAX_CLIENTS];
int Num = GameWorld()->FindEntities(m_Pos, 20.0f, (CEntity**)apEnts, 64, CGameWorld::ENTTYPE_CHARACTER);
int Num = GameWorld()->FindEntities(m_Pos, 20.0f, (CEntity**)apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
for(int i = 0; i < Num; ++i) {
CCharacter * pChr = apEnts[i];
if(pChr && pChr->IsAlive())

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

@ -203,7 +203,7 @@ void CGameWorld::UpdatePlayerMaps()
for (int j = 0; j < VANILLA_MAX_CLIENTS; j++)
{
if (map[j] == -1) continue;
if (dist[map[j]].first > 1e9) map[j] = -1;
//if (dist[map[j]].first > 1e9) map[j] = -1;
else rMap[map[j]] = j;
}
@ -219,7 +219,7 @@ void CGameWorld::UpdatePlayerMaps()
if (mapc < VANILLA_MAX_CLIENTS - 1)
map[mapc] = k;
else
if (dist[j].first < 1300) // dont bother freeing up space for players which are too far to be displayed anyway
if (dist[j].first < 4300) // dont bother freeing up space for players which are too far to be displayed anyway
demand++;
}
for (int j = MAX_CLIENTS - 1; j > VANILLA_MAX_CLIENTS - 2; j--)