TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix kill accounting

Browse source 
Fixes: c4ae4e5379 ("Pass player number to multi functions")
This commit is contained in:
Kp 2015-03-24 02:35:37 +00:00
parent 0707664ae1
commit 5d6e2c16c6
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
similar/main/multi.cpp
View file

@ -1706,7 +1706,7 @@ static void multi_do_player_deres(const playernum_t pnum, const ubyte *buf)
/*
* Process can compute a kill. If I am a Client this might be my own one (see multi_send_kill()) but with more specific data so I can compute my kill correctly.
*/
static void multi_do_kill(const playernum_t pnum, const ubyte *buf)
static void multi_do_kill(playernum_t, const ubyte *buf)
{
int count = 1;
int type = (int)(buf[0]);
@ -1716,6 +1716,7 @@ static void multi_do_kill(const playernum_t pnum, const ubyte *buf)
if (!multi_i_am_master() && type != MULTI_KILL_HOST)
return;
const playernum_t pnum = buf[1];
if (pnum >= N_players)
{
Int3(); // Invalid player number killed
@ -2860,10 +2861,6 @@ void multi_send_kill(const vobjptridx_t objnum)
{
multibuf[count] = Netgame.team_vector; count += 1;
multibuf[count] = Bounty_target; count += 1;
}
if (multi_i_am_master())
{
multi_compute_kill(killer_objnum, objnum);
multi_send_data<MULTI_KILL_HOST>(multibuf, count, 2);
}