mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r11763) -Fix: update signal states after merging a company

This commit is contained in:
smatz 2008-01-05 22:04:11 +00:00
parent 91be5d7531
commit e165aad4db
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/economy.cpp
View File

@ -40,6 +40,9 @@
#include "date_func.h"
#include "vehicle_func.h"
#include "sound_func.h"
#include "track_type.h"
#include "track_func.h"
#include "rail_map.h"
/**
* Multiply two integer values and shift the results to right.
@ -423,6 +426,22 @@ void ChangeOwnershipOfPlayerItems(PlayerID old_player, PlayerID new_player)
do {
ChangeTileOwner(tile, old_player, new_player);
} while (++tile != MapSize());
if (new_player != PLAYER_SPECTATOR) {
/* Update all signals because there can be new segment that was owned by two players
* and signals were not propagated */
tile = 0;
do {
if (IsTileType(tile, MP_RAILWAY) && IsTileOwner(tile, new_player) && HasSignals(tile)) {
TrackBits tracks = GetTrackBits(tile);
do { // there may be two tracks with signals for TRACK_BIT_HORZ and TRACK_BIT_VERT
Track track = RemoveFirstTrack(&tracks);
if (HasSignalOnTrack(tile, track)) SetSignalsOnBothDir(tile, track);
} while (tracks != TRACK_BIT_NONE);
}
} while (++tile != MapSize());
}
}
/* Change color of existing windows */