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

Use array<> for team_kills

Browse source
This commit is contained in:
Kp 2014-12-06 04:52:53 +00:00
parent a55028d5b4
commit cfe0f89dae
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/multi.h
View file

@ -314,7 +314,7 @@ extern int Player_joining_extras;
extern int Network_player_added;
extern array<array<short, MAX_PLAYERS>, MAX_PLAYERS> kill_matrix;
extern short team_kills[2];
extern array<uint16_t, 2> team_kills;
extern int multi_goto_secret;

2
similar/main/multi.cpp
View file

@ -144,7 +144,7 @@ int Network_message_reciever=-1;
int sorted_kills[MAX_PLAYERS];
array<array<short, MAX_PLAYERS>, MAX_PLAYERS> kill_matrix;
int multi_goto_secret = 0;
short team_kills[2];
array<uint16_t, 2> team_kills;
int multi_quit_game = 0;
const char GMNames[MULTI_GAME_TYPE_COUNT][MULTI_GAME_NAME_LENGTH]={
"Anarchy",

7
similar/main/net_udp.cpp
View file

@ -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();