diff options
Diffstat (limited to 'src/economy.cpp')
| -rw-r--r-- | src/economy.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index 24eab5466..b3d635a02 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -255,6 +255,8 @@ void ChangeOwnershipOfPlayerItems(PlayerID old_player, PlayerID new_player) Town *t; PlayerID old = _current_player; + assert(old_player != new_player); + { Player *p; uint i; @@ -1774,12 +1776,16 @@ int32 CmdSellShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) int32 CmdBuyCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { Player *p; + PlayerID pid = (PlayerID)p1; /* Disable takeovers in multiplayer games */ - if (!IsValidPlayer((PlayerID)p1) || _networking) return CMD_ERROR; + if (!IsValidPlayer(pid) || _networking) return CMD_ERROR; + + /* Do not allow players to take over themselves */ + if (pid == _current_player) return CMD_ERROR; SET_EXPENSES_TYPE(EXPENSES_OTHER); - p = GetPlayer((PlayerID)p1); + p = GetPlayer(pid); if (!p->is_ai) return CMD_ERROR; |