dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.

Browse Source
This commit is contained in:
rubidium
2007-08-31 17:15:46 +00:00
parent cadc470da5
commit 0cf6a3f1ef
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/economy.cpp
View File

@@ -1802,11 +1802,16 @@ CommandCost CmdBuyShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32
Player *p; Player *p;
CommandCost cost; CommandCost cost;
/* Check if buying shares is allowed (protection against modified clients */ /* Check if buying shares is allowed (protection against modified clients) */
if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares) return CMD_ERROR; /* Cannot buy own shares */
if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares || _current_player == (PlayerID)p1) return CMD_ERROR;
p = GetPlayer((PlayerID)p1);
/* Cannot buy shares of non-existent nor bankrupted company */
if (!p->is_active) return CMD_ERROR;
SET_EXPENSES_TYPE(EXPENSES_OTHER); SET_EXPENSES_TYPE(EXPENSES_OTHER);
p = GetPlayer((PlayerID)p1);
/* Protect new companies from hostile takeovers */ /* Protect new companies from hostile takeovers */
if (_cur_year - p->inaugurated_year < 6) return_cmd_error(STR_7080_PROTECTED); if (_cur_year - p->inaugurated_year < 6) return_cmd_error(STR_7080_PROTECTED);
@@ -1848,11 +1853,16 @@ CommandCost CmdSellShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint3
Player *p; Player *p;
Money cost; Money cost;
/* Check if buying shares is allowed (protection against modified clients */ /* Check if selling shares is allowed (protection against modified clients) */
if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares) return CMD_ERROR; /* Cannot sell own shares */
if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares || _current_player == (PlayerID)p1) return CMD_ERROR;
p = GetPlayer((PlayerID)p1);
/* Cannot sell shares of non-existent nor bankrupted company */
if (!p->is_active) return CMD_ERROR;
SET_EXPENSES_TYPE(EXPENSES_OTHER); SET_EXPENSES_TYPE(EXPENSES_OTHER);
p = GetPlayer((PlayerID)p1);
/* Those lines are here for network-protection (clients can be slow) */ /* Those lines are here for network-protection (clients can be slow) */
if (GetAmountOwnedBy(p, _current_player) == 0) return CommandCost(); if (GetAmountOwnedBy(p, _current_player) == 0) return CommandCost();