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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/lang/arabic_egypt.txt
This commit is contained in:
Jonathan G Rennison
2021-11-10 01:05:30 +00:00
parent d35b9719a9 48c1c7f221
commit 58d8418f83
67 changed files with 181 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/object_cmd.cpp
View File

@@ -207,7 +207,7 @@ static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlag flags);
*/
CommandCost CmdBuildObject(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
CommandCost cost(EXPENSES_PROPERTY);
CommandCost cost(EXPENSES_CONSTRUCTION);
ObjectType type = (ObjectType)GB(p1, 0, 16);
if (type >= NUM_OBJECTS) return CMD_ERROR;
@@ -673,7 +673,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;
}