amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-26 00:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: make ExpensesType a scoped enum (#15572)

Browse Source
This commit is contained in:
Peter Nelson
2026-05-04 08:20:52 +01:00
committed by GitHub
parent cd597f79ad
commit 792f6d99a3
35 changed files with 200 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object_cmd.cpp
+6 -6
View File
@@ -209,7 +209,7 @@ static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlags flags);
*/
CommandCost CmdBuildObject(DoCommandFlags flags, TileIndex tile, ObjectType type, uint8_t view)
{
CommandCost cost(EXPENSES_CONSTRUCTION);
CommandCost cost(ExpensesType::Construction);
if (type >= ObjectSpec::Count()) return CMD_ERROR;
const ObjectSpec *spec = ObjectSpec::Get(type);
@@ -405,7 +405,7 @@ CommandCost CmdBuildObjectArea(DoCommandFlags flags, TileIndex tile, TileIndex s
if (spec->size != OBJECT_SIZE_1X1) return CMD_ERROR;
Money money = GetAvailableMoneyForCommand();
CommandCost cost(EXPENSES_CONSTRUCTION);
CommandCost cost(ExpensesType::Construction);
CommandCost last_error = CMD_ERROR;
bool had_success = false;
@@ -550,7 +550,7 @@ static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlags flags)
ObjectType type = o->type;
const ObjectSpec *spec = ObjectSpec::Get(type);
CommandCost cost(EXPENSES_CONSTRUCTION, spec->GetClearCost() * ta.w * ta.h / 5);
CommandCost cost(ExpensesType::Construction, spec->GetClearCost() * ta.w * ta.h / 5);
if (spec->flags.Test(ObjectFlag::ClearIncome)) cost.MultiplyCost(-1); // They get an income!
/* Towns can't remove any objects. */
@@ -597,7 +597,7 @@ static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlags flags)
}
/* cost of relocating company is 1% of company value */
cost = CommandCost(EXPENSES_CONSTRUCTION, CalculateCompanyValue(c) / 100);
cost = CommandCost(ExpensesType::Construction, CalculateCompanyValue(c) / 100);
break;
}
@@ -996,10 +996,10 @@ static CommandCost TerraformTile_Object(TileIndex tile, DoCommandFlags flags, in
if (spec->callback_mask.Test(ObjectCallbackMask::Autoslope)) {
/* If the callback fails, allow autoslope. */
uint16_t res = GetObjectCallback(CBID_OBJECT_AUTOSLOPE, 0, 0, spec, Object::GetByTile(tile), tile);
if (res == CALLBACK_FAILED || !ConvertBooleanCallback(spec->grf_prop.grffile, CBID_OBJECT_AUTOSLOPE, res)) return CommandCost(EXPENSES_CONSTRUCTION, _price[Price::BuildFoundation]);
if (res == CALLBACK_FAILED || !ConvertBooleanCallback(spec->grf_prop.grffile, CBID_OBJECT_AUTOSLOPE, res)) return CommandCost(ExpensesType::Construction, _price[Price::BuildFoundation]);
} else if (spec->IsEnabled()) {
/* allow autoslope */
return CommandCost(EXPENSES_CONSTRUCTION, _price[Price::BuildFoundation]);
return CommandCost(ExpensesType::Construction, _price[Price::BuildFoundation]);
}
}
}