From e686add63a0d663c027672d5ab696a2e940b195e Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 11 May 2015 16:53:05 +0000 Subject: (svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes. --- src/economy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/economy.cpp b/src/economy.cpp index 37a89b3f2..09eec0386 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -300,7 +300,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner) /* Single player cheated to AI company. * There are no spectators in single player, so we must pick some other company. */ assert(!_networking); - Backup cur_company(_current_company, FILE_LINE); + Backup cur_company2(_current_company, FILE_LINE); Company *c; FOR_ALL_COMPANIES(c) { if (c->index != old_owner) { @@ -308,7 +308,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner) break; } } - cur_company.Restore(); + cur_company2.Restore(); assert(old_owner != _local_company); } -- cgit v1.2.3-70-g09d2