Mercurial > hg > openttd
changeset 9890:5515226f858d draft
(svn r14038) -Fix [FS#2211] (r13731): company limit was not properly enforced for CMD_PLAYER_CTRL.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Sun, 10 Aug 2008 19:00:33 +0000 |
| parents | 2bedf7c40bee |
| children | 95fb811fb1d3 |
| files | src/player_base.h src/players.cpp |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/player_base.h +++ b/src/player_base.h @@ -24,7 +24,11 @@ Money company_value; }; -DECLARE_OLD_POOL(Player, Player, 1, MAX_PLAYERS) +/* The third parameter and the number after >> MUST be the same, + * otherwise more (or less) players will be allowed to be + * created than what MAX_PLAYER specifies! + */ +DECLARE_OLD_POOL(Player, Player, 1, MAX_PLAYERS >> 1) struct Player : PoolItem<Player, PlayerByte, &_Player_pool> { Player(uint16 name_1 = 0, bool is_ai = false);
--- a/src/players.cpp +++ b/src/players.cpp @@ -516,9 +516,9 @@ */ Player *DoStartupNewPlayer(bool is_ai) { - Player *p = new Player(STR_SV_UNNAMED, is_ai); + if (!Player::CanAllocateItem()) return NULL; - if (p == NULL) return NULL; + Player *p = new Player(STR_SV_UNNAMED, is_ai); memset(&_players_ai[p->index], 0, sizeof(PlayerAI)); memset(&_players_ainew[p->index], 0, sizeof(PlayerAiNew));