mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r6748) -Codechange: Use already existing function to count active players.
This commit is contained in:
parent
f389bd25ae
commit
23197f4c69
|
@ -531,12 +531,7 @@ static int GetPlayerIndexFromMenu(int index)
|
|||
|
||||
static void UpdatePlayerMenuHeight(Window *w)
|
||||
{
|
||||
uint num = 0;
|
||||
const Player *p;
|
||||
|
||||
FOR_ALL_PLAYERS(p) {
|
||||
if (p->is_active) num++;
|
||||
}
|
||||
byte num = ActivePlayerCount();
|
||||
|
||||
// Increase one to fit in PlayerList in the menu when in network
|
||||
if (_networking && WP(w,menu_d).main_button == 9) num++;
|
||||
|
|
12
player.h
12
player.h
|
@ -216,7 +216,17 @@ VARDEF Player _players[MAX_PLAYERS];
|
|||
// NOSAVE: can be determined from player structs
|
||||
VARDEF byte _player_colors[MAX_PLAYERS];
|
||||
|
||||
byte ActivePlayerCount(void);
|
||||
static inline byte ActivePlayerCount(void)
|
||||
{
|
||||
const Player *p;
|
||||
byte count = 0;
|
||||
|
||||
FOR_ALL_PLAYERS(p) {
|
||||
if (p->is_active) count++;
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
static inline Player* GetPlayer(PlayerID i)
|
||||
{
|
||||
|
|
12
players.c
12
players.c
|
@ -192,18 +192,6 @@ void DrawPlayerFace(uint32 face, int color, int x, int y)
|
|||
}
|
||||
}
|
||||
|
||||
byte ActivePlayerCount(void)
|
||||
{
|
||||
const Player *p;
|
||||
byte count = 0;
|
||||
|
||||
FOR_ALL_PLAYERS(p) {
|
||||
if (p->is_active) count++;
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
void InvalidatePlayerWindows(const Player *p)
|
||||
{
|
||||
PlayerID pid = p->index;
|
||||
|
|
Loading…
Reference in New Issue