From 9db3cde73af598852da13b748eef31a8207cfcf2 Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 31 May 2010 20:22:57 +0000 Subject: (svn r19914) -Codechange: Wrap a helper class around temporary assignments of _current_company to ensure proper restoration. --- src/misc_cmd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/misc_cmd.cpp') diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp index fe9bc9fde..181b8c190 100644 --- a/src/misc_cmd.cpp +++ b/src/misc_cmd.cpp @@ -21,6 +21,7 @@ #include "company_func.h" #include "company_gui.h" #include "company_base.h" +#include "core/backup_type.hpp" #include "table/strings.h" @@ -228,10 +229,9 @@ CommandCost CmdGiveMoney(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 if (flags & DC_EXEC) { /* Add money to company */ - CompanyID old_company = _current_company; - _current_company = (CompanyID)p2; + Backup cur_company(_current_company, (CompanyID)p2); SubtractMoneyFromCompany(CommandCost(EXPENSES_OTHER, -amount.GetCost())); - _current_company = old_company; + cur_company.Restore(); } /* Subtract money from local-company */ -- cgit v1.2.3-54-g00ecf