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

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-02-21 21:18:01 +00:00
parent 70794644cc 75031c9693
commit b96e7f78fb
26 changed files with 368 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/company_cmd.cpp
View File

@@ -211,7 +211,7 @@ bool CheckCompanyHasMoney(CommandCost &cost)
* @param c Company to pay the bill.
* @param cost Money to pay.
*/
static void SubtractMoneyFromAnyCompany(Company *c, CommandCost cost)
static void SubtractMoneyFromAnyCompany(Company *c, const CommandCost &cost)
{
if (cost.GetCost() == 0) return;
assert(cost.GetExpensesType() != INVALID_EXPENSES);
@@ -242,7 +242,7 @@ static void SubtractMoneyFromAnyCompany(Company *c, CommandCost cost)
* Subtract money from the #_current_company, if the company is valid.
* @param cost Money to pay.
*/
void SubtractMoneyFromCompany(CommandCost cost)
void SubtractMoneyFromCompany(const CommandCost &cost)
{
Company *c = Company::GetIfValid(_current_company);
if (c != nullptr) SubtractMoneyFromAnyCompany(c, cost);
@@ -253,7 +253,7 @@ void SubtractMoneyFromCompany(CommandCost cost)
* @param company Company paying the bill.
* @param cst Cost of a command.
*/
void SubtractMoneyFromCompanyFract(CompanyID company, CommandCost cst)
void SubtractMoneyFromCompanyFract(CompanyID company, const CommandCost &cst)
{
Company *c = Company::Get(company);
byte m = c->money_fraction;