diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e2dd5e5be..003272587 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -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 diff --git a/main/gamecntl.c b/main/gamecntl.c index ca88e8cf0..eb1bf97b7 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -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) diff --git a/main/multi.c b/main/multi.c index e26eedd77..0a7263a75 100644 --- a/main/multi.c +++ b/main/multi.c @@ -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 ) diff --git a/main/multi.h b/main/multi.h index b7204e538..bbceab25f 100644 --- a/main/multi.h +++ b/main/multi.h @@ -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