Merge remote-tracking branch 'upstream/master'

This commit is contained in:
dP
2021-11-08 23:47:49 +03:00
54 changed files with 359 additions and 272 deletions

View File

@@ -204,7 +204,7 @@ static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlag flags);
*/
CommandCost CmdBuildObject(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
{
CommandCost cost(EXPENSES_PROPERTY);
CommandCost cost(EXPENSES_CONSTRUCTION);
ObjectType type = (ObjectType)GB(p1, 0, 16);
if (type >= NUM_OBJECTS) return CMD_ERROR;
@@ -527,7 +527,7 @@ static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlag flags)
}
/* cost of relocating company is 1% of company value */
cost = CommandCost(EXPENSES_PROPERTY, CalculateCompanyValue(c) / 100);
cost = CommandCost(EXPENSES_CONSTRUCTION, CalculateCompanyValue(c) / 100);
break;
}