diff options
| author | alberth <alberth@openttd.org> | 2009-06-01 11:43:36 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2009-06-01 11:43:36 +0000 |
| commit | bab70a823dd810e1d4477f0c01d3a7b3e9b19ac8 (patch) | |
| tree | 2668a1043fb310d44e67f4deb07871519d406a55 /src/signal.cpp | |
| parent | 5e91bf0ad20e0c60b31e190a1f02f184020238de (diff) | |
| download | openttd-bab70a823dd810e1d4477f0c01d3a7b3e9b19ac8.tar.xz | |
(svn r16491) -Codechange: Added parentheses around bitwise operators for code style.
Diffstat (limited to 'src/signal.cpp')
| -rw-r--r-- | src/signal.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/signal.cpp b/src/signal.cpp index 8600e5a3b..f42819894 100644 --- a/src/signal.cpp +++ b/src/signal.cpp @@ -341,7 +341,7 @@ static SigFlags ExploreSegment(Owner owner) } for (DiagDirection dir = DIAGDIR_BEGIN; dir < DIAGDIR_END; dir++) { // test all possible exit directions - if (dir != enterdir && tracks & _enterdir_to_trackbits[dir]) { // any track incidating? + if (dir != enterdir && (tracks & _enterdir_to_trackbits[dir])) { // any track incidating? TileIndex newtile = tile + TileOffsByDiagDir(dir); // new tile to check DiagDirection newdir = ReverseDiagDir(dir); // direction we are entering from if (!MaybeAddToTodoSet(newtile, newdir, tile, dir)) return flags | SF_FULL; @@ -425,7 +425,7 @@ static void UpdateSignalsAroundSegment(SigFlags flags) /* is it a bidir combo? - then do not count its other signal direction as exit */ if (sig == SIGTYPE_COMBO && HasSignalOnTrackdir(tile, ReverseTrackdir(trackdir))) { /* at least one more exit */ - if (flags & SF_EXIT2 && + if ((flags & SF_EXIT2) && /* no green exit */ (!(flags & SF_GREEN) || /* only one green exit, and it is this one - so all other exits are red */ @@ -433,7 +433,7 @@ static void UpdateSignalsAroundSegment(SigFlags flags) newstate = SIGNAL_STATE_RED; } } else { // entry, at least one exit, no green exit - if (IsPresignalEntry(tile, TrackdirToTrack(trackdir)) && flags & SF_EXIT && !(flags & SF_GREEN)) newstate = SIGNAL_STATE_RED; + if (IsPresignalEntry(tile, TrackdirToTrack(trackdir)) && (flags & SF_EXIT) && !(flags & SF_GREEN)) newstate = SIGNAL_STATE_RED; } } @@ -535,7 +535,7 @@ static SigSegState UpdateSignalsInBuffer(Owner owner) /* SIGSEG_FREE is set by default */ if (flags & SF_PBS) { state = SIGSEG_PBS; - } else if (flags & SF_TRAIN || (flags & SF_EXIT && !(flags & SF_GREEN)) || flags & SF_FULL) { + } else if ((flags & SF_TRAIN) || ((flags & SF_EXIT) && !(flags & SF_GREEN)) || (flags & SF_FULL)) { state = SIGSEG_FULL; } } |