summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-06-28 06:21:03 +0000
committertron <tron@openttd.org>2006-06-28 06:21:03 +0000
commit6302469aa84c12de98c8f3f1d2de2963067c47ee (patch)
tree329449f48fb360f15a378040554e69505236de71
parentc01951418dc9ec1b8f58cf2ed606ae5fd5c728d8 (diff)
downloadopenttd-6302469aa84c12de98c8f3f1d2de2963067c47ee.tar.xz
(svn r5399) Simplify a conditional expression: (a && b) || (!a && !b) -> a == b
-rw-r--r--vehicle_gui.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/vehicle_gui.c b/vehicle_gui.c
index 2d3edfd34..967b6ae60 100644
--- a/vehicle_gui.c
+++ b/vehicle_gui.c
@@ -538,9 +538,8 @@ static void SetupScrollStuffForReplaceWindow(Window *w)
const EngineInfo* info = EngInfo(eid);
// left window contains compatible engines while right window only contains engines of the selected type
- if (ENGINE_AVAILABLE && (
- (RailVehInfo(eid)->power != 0 && WP(w, replaceveh_d).wagon_btnstate) ||
- (RailVehInfo(eid)->power == 0 && !WP(w, replaceveh_d).wagon_btnstate))) {
+ if (ENGINE_AVAILABLE &&
+ (RailVehInfo(eid)->power != 0) == (WP(w, replaceveh_d).wagon_btnstate != 0)) {
if (IsCompatibleRail(e->railtype, railtype) && (_player_num_engines[eid] > 0 || EngineHasReplacementForPlayer(p, eid))) {
if (sel[0] == count) selected_id[0] = eid;
count++;