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

Decrease personal score when killing multi buddy and don't increment towards kill goal; Killing off some old externs on which I don't wanna waste an extra commit

Browse source
This commit is contained in:
zicodxx 2013-01-19 16:37:42 +01:00
parent 06b1efad8f
commit b6a906bc53
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D2X-Rebirth Changelog
20130119
--------
main/multi.c, main/multi.h, main/gamecntl.c: Decrease personal score when killing multi buddy and don't increment towards kill goal; Killing off some old externs on which I don't wanna waste an extra commit
20130117
--------
main/render.c: Fix click-selection in the editor for OpenGL implementations that insist on point blending

3
main/gamecntl.c
View file

@ -483,9 +483,6 @@ int do_game_pause()
return 0 /*key*/; // Keycode returning ripped out (kreatordxx)
}
extern char *RankStrings[];
extern int PhallicLimit,PhallicMan;
int HandleEndlevelKey(int key)
{
switch (key)

10
main/multi.c
View file

@ -782,12 +782,18 @@ void multi_compute_kill(int killer, int killed)
if (Game_mode & GM_TEAM)
{
if (get_team(killed_pnum) == get_team(killer_pnum))
{
team_kills[get_team(killed_pnum)] -= 1;
Players[killer_pnum].net_kills_total -= 1;
}
else
{
team_kills[get_team(killer_pnum)] += 1;
Players[killer_pnum].net_kills_total += 1;
Players[killer_pnum].KillGoalCount +=1;
}
}
if( Game_mode & GM_BOUNTY )
else if( Game_mode & GM_BOUNTY )
{
/* Did the target die? Did the target get a kill? */
if( killed_pnum == Bounty_target || killer_pnum == Bounty_target )

2
main/multi.h
View file

@ -60,7 +60,7 @@ extern int multi_protocol; // set and determinate used protocol
#define MULTI_PROTO_UDP 1 // UDP protocol
// What version of the multiplayer protocol is this? Increment each time something drastic changes in Multiplayer without the version number changes. Can be reset to 0 each time the version of the game changes
#define MULTI_PROTO_VERSION 3
#define MULTI_PROTO_VERSION 5
// PROTOCOL VARIABLES AND DEFINES - END