mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14038) -Fix [FS#2211] (r13731): company limit was not properly enforced for CMD_PLAYER_CTRL.

release/0.7
rubidium 2008-08-10 19:00:33 +00:00
parent 4eae917c1c
commit 2086f77dab
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/player_base.h
View File

@ -24,7 +24,11 @@ struct PlayerEconomyEntry {
Money company_value; 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> { struct Player : PoolItem<Player, PlayerByte, &_Player_pool> {
Player(uint16 name_1 = 0, bool is_ai = false); Player(uint16 name_1 = 0, bool is_ai = false);

4
src/players.cpp
View File

@ -516,9 +516,9 @@ void ResetPlayerLivery(Player *p)
*/ */
Player *DoStartupNewPlayer(bool is_ai) 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_ai[p->index], 0, sizeof(PlayerAI));
memset(&_players_ainew[p->index], 0, sizeof(PlayerAiNew)); memset(&_players_ainew[p->index], 0, sizeof(PlayerAiNew));