gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-08 23:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r24204) -Fix: If a company is taken over or bankrupts, transfer exclusive transport rights to the new owner resp. cancel them.

Browse Source
This commit is contained in:
frosch 2012-05-06 11:37:43 +00:00
parent 16e913505e
commit 3e7642abe5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/economy.cpp
View File

@ -360,7 +360,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
} }
if (new_owner == INVALID_OWNER) RebuildSubsidisedSourceAndDestinationCache(); if (new_owner == INVALID_OWNER) RebuildSubsidisedSourceAndDestinationCache();
/* Take care of rating in towns */ /* Take care of rating and transport rights in towns */
FOR_ALL_TOWNS(t) { FOR_ALL_TOWNS(t) {
/* If a company takes over, give the ratings to that company. */ /* If a company takes over, give the ratings to that company. */
if (new_owner != INVALID_OWNER) { if (new_owner != INVALID_OWNER) {
@ -378,6 +378,16 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
/* Reset the ratings for the old owner */ /* Reset the ratings for the old owner */
t->ratings[old_owner] = RATING_INITIAL; t->ratings[old_owner] = RATING_INITIAL;
ClrBit(t->have_ratings, old_owner); ClrBit(t->have_ratings, old_owner);
/* Transfer exclusive rights */
if (t->exclusive_counter > 0 && t->exclusivity == old_owner) {
if (new_owner != INVALID_OWNER) {
t->exclusivity = new_owner;
} else {
t->exclusive_counter = 0;
t->exclusivity = INVALID_COMPANY;
}
}
} }
{ {