mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes.

release/1.6
frosch 2015-05-11 16:53:05 +00:00
parent 18da27ed6e
commit e686add63a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/economy.cpp
View File

@ -300,7 +300,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
/* Single player cheated to AI company. /* Single player cheated to AI company.
* There are no spectators in single player, so we must pick some other company. */ * There are no spectators in single player, so we must pick some other company. */
assert(!_networking); assert(!_networking);
Backup<CompanyByte> cur_company(_current_company, FILE_LINE); Backup<CompanyByte> cur_company2(_current_company, FILE_LINE);
Company *c; Company *c;
FOR_ALL_COMPANIES(c) { FOR_ALL_COMPANIES(c) {
if (c->index != old_owner) { if (c->index != old_owner) {
@ -308,7 +308,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
break; break;
} }
} }
cur_company.Restore(); cur_company2.Restore();
assert(old_owner != _local_company); assert(old_owner != _local_company);
} }