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

fixed crashbug caused by players disconnecting while still having bullets in the air

Browse source
This commit is contained in:
Magnus Auvinen 2008-12-19 08:26:58 +00:00
parent 557636dca3
commit 55254d0657
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/game/server/gamecontroller.cpp
View file

@ -345,6 +345,9 @@ bool GAMECONTROLLER::is_friendly_fire(int cid1, int cid2)
if(is_teamplay()) if(is_teamplay())
{ {
if(!game.players[cid1] || !game.players[cid2])
return false;
if(game.players[cid1]->team == game.players[cid2]->team) if(game.players[cid1]->team == game.players[cid2]->team)
return true; return true;
} }
@ -505,6 +508,10 @@ void GAMECONTROLLER::snap(int snapping_client)
int GAMECONTROLLER::get_auto_team(int notthisid) int GAMECONTROLLER::get_auto_team(int notthisid)
{ {
// this will force the auto balancer to work overtime aswell
if(config.dbg_stress)
return 0;
int numplayers[2] = {0,0}; int numplayers[2] = {0,0};
for(int i = 0; i < MAX_CLIENTS; i++) for(int i = 0; i < MAX_CLIENTS; i++)
{ {