From cfe0f89daebda56b30d07f78ffd780762c781594 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 6 Dec 2014 04:52:53 +0000 Subject: [PATCH] Use array<> for team_kills --- common/main/multi.h | 2 +- similar/main/multi.cpp | 2 +- similar/main/net_udp.cpp | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/common/main/multi.h b/common/main/multi.h index fffe4308a..b62334e15 100644 --- a/common/main/multi.h +++ b/common/main/multi.h @@ -314,7 +314,7 @@ extern int Player_joining_extras; extern int Network_player_added; extern array, MAX_PLAYERS> kill_matrix; -extern short team_kills[2]; +extern array team_kills; extern int multi_goto_secret; diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index 4dab5c2eb..f1c498683 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -144,7 +144,7 @@ int Network_message_reciever=-1; int sorted_kills[MAX_PLAYERS]; array, MAX_PLAYERS> kill_matrix; int multi_goto_secret = 0; -short team_kills[2]; +array team_kills; int multi_quit_game = 0; const char GMNames[MULTI_GAME_TYPE_COUNT][MULTI_GAME_NAME_LENGTH]={ "Anarchy", diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp index 26da63a60..81462c36c 100644 --- a/similar/main/net_udp.cpp +++ b/similar/main/net_udp.cpp @@ -2084,8 +2084,7 @@ void net_udp_update_netgame(void) Netgame.player_flags[i] = (Players[i].flags & (PLAYER_FLAGS_BLUE_KEY | PLAYER_FLAGS_RED_KEY | PLAYER_FLAGS_GOLD_KEY)); #endif } - Netgame.team_kills[0] = team_kills[0]; - Netgame.team_kills[1] = team_kills[1]; + Netgame.team_kills = team_kills; Netgame.levelnum = Current_level_num; } @@ -3475,9 +3474,7 @@ void net_udp_read_sync_packet( ubyte * data, int data_len, const _sockaddr &send Players[Player_num].time_level = Netgame.level_time; } - team_kills[0] = Netgame.team_kills[0]; - team_kills[1] = Netgame.team_kills[1]; - + team_kills = Netgame.team_kills; Players[Player_num].connected = CONNECT_PLAYING; Netgame.players[Player_num].connected = CONNECT_PLAYING; Netgame.players[Player_num].rank=GetMyNetRanking();