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

Fix #9579: Object and HQ construction is Construction cost, not Property Maintenance (#9673)

pull/9683/head
Tyler Trahan 2021-11-08 03:12:15 -05:00 committed by GitHub
parent c38af72978
commit e9cb9c1135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
regression/regression/result.txt
View File

@ -639,7 +639,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
GetQuarterlyCompanyValue(): -1 GetQuarterlyCompanyValue(): -1
Quarter: 0 Quarter: 0
GetQuarterlyIncome(): 0 GetQuarterlyIncome(): 0
GetQuarterlyExpenses(): -210 GetQuarterlyExpenses(): 0
GetQuarterlyCargoDelivered(): 0 GetQuarterlyCargoDelivered(): 0
GetQuarterlyPerformanceRating(): -1 GetQuarterlyPerformanceRating(): -1
GetQuarterlyCompanyValue(): 1 GetQuarterlyCompanyValue(): 1

4
src/object_cmd.cpp
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 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); ObjectType type = (ObjectType)GB(p1, 0, 16);
if (type >= NUM_OBJECTS) return CMD_ERROR; if (type >= NUM_OBJECTS) return CMD_ERROR;
@ -526,7 +526,7 @@ static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlag flags)
} }
/* cost of relocating company is 1% of company value */ /* cost of relocating company is 1% of company value */
cost = CommandCost(EXPENSES_PROPERTY, CalculateCompanyValue(c) / 100); cost = CommandCost(EXPENSES_CONSTRUCTION, CalculateCompanyValue(c) / 100);
break; break;
} }