Changeset - r26059:8050c4d61d9d
[Not reviewed]
master
0 2 0
Tyler Trahan - 3 years ago 2021-11-08 08:12:15
tyler@tylertrahan.com
Fix #9579: Object and HQ construction is Construction cost, not Property Maintenance (#9673)
2 files changed with 3 insertions and 3 deletions:
0 comments (0 inline, 0 general)
regression/regression/result.txt
Show inline comments
 
@@ -639,7 +639,7 @@ ERROR: IsEnd() is invalid as Begin() is 
 
    GetQuarterlyCompanyValue():      -1
 
  Quarter: 0
 
    GetQuarterlyIncome():            0
 
    GetQuarterlyExpenses():          -210
 
    GetQuarterlyExpenses():          0
 
    GetQuarterlyCargoDelivered():    0
 
    GetQuarterlyPerformanceRating(): -1
 
    GetQuarterlyCompanyValue():      1
src/object_cmd.cpp
Show inline comments
 
@@ -204,7 +204,7 @@ static CommandCost ClearTile_Object(Tile
 
 */
 
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;
 
@@ -526,7 +526,7 @@ static CommandCost ClearTile_Object(Tile
 
			}
 

	
 
			/* cost of relocating company is 1% of company value */
 
			cost = CommandCost(EXPENSES_PROPERTY, CalculateCompanyValue(c) / 100);
 
			cost = CommandCost(EXPENSES_CONSTRUCTION, CalculateCompanyValue(c) / 100);
 
			break;
 
		}
 

	
0 comments (0 inline, 0 general)