From 3e5a87a52cc8355a2a5c2831c60643bf30d41a3a Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 11 Jan 2010 20:21:56 +0000 Subject: (svn r18783) -Codechange: make CheckCompanyHasMoney set an error on the CommandCost it tests when you don't have enough money instead of setting a global variable. --- src/company_cmd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/company_cmd.cpp') diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index be4912ff2..2150b43ab 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -156,13 +156,13 @@ void InvalidateCompanyWindows(const Company *company) SetWindowDirty(WC_FINANCES, cid); } -bool CheckCompanyHasMoney(CommandCost cost) +bool CheckCompanyHasMoney(CommandCost &cost) { if (cost.GetCost() > 0) { const Company *c = Company::GetIfValid(_current_company); if (c != NULL && cost.GetCost() > c->money) { SetDParam(0, cost.GetCost()); - _error_message = STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY; + cost.MakeError(STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY); return false; } } -- cgit v1.2.3-54-g00ecf