mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes.
This commit is contained in:
parent
18da27ed6e
commit
e686add63a
|
@ -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<CompanyByte> cur_company(_current_company, FILE_LINE);
|
||||
Backup<CompanyByte> 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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue