diff options
author | rubidium <rubidium@openttd.org> | 2008-08-10 19:00:33 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-08-10 19:00:33 +0000 |
commit | b3a15a398394cfb0f43bfa4dad971fb77457ff94 (patch) | |
tree | ad0db2d5397b9ddf228f397b54d835dba0d3d97d /src/players.cpp | |
parent | 110a9f8fc05abfc09cd56730dafea62c9d739f98 (diff) | |
download | openttd-b3a15a398394cfb0f43bfa4dad971fb77457ff94.tar.xz |
(svn r14038) -Fix [FS#2211] (r13731): company limit was not properly enforced for CMD_PLAYER_CTRL.
Diffstat (limited to 'src/players.cpp')
-rw-r--r-- | src/players.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/players.cpp b/src/players.cpp index c3bef5c3c..d8e8ad685 100644 --- a/src/players.cpp +++ b/src/players.cpp @@ -516,9 +516,9 @@ void ResetPlayerLivery(Player *p) */ 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)); |