# HG changeset patch
# User tron <tron@openttd.org>
# Date 2005-08-02 20:04:09
# Node ID 3c12f58ef97abb2af2c80ef855aac3f188b473bc
# Parent  0f5aec99956ce1d90d477f9e691b5a56dda2730a

(svn r2794) Fix a comment and get rid of some parentheses using DeMorgan's law

diff --git a/economy.c b/economy.c
--- a/economy.c
+++ b/economy.c
@@ -821,11 +821,11 @@ Pair SetupSubsidyDecodeParam(Subsidy *s,
 	TileIndex tile2;
 	Pair tp;
 
-	/* if mode is false, convert into plural */
-	SetDParam(0, _cargoc.names_s[s->cargo_type] + (mode?0:32));
+	/* if mode is false, use the singular form */
+	SetDParam(0, _cargoc.names_s[s->cargo_type] + (mode ? 0 : 32));
 
 	if (s->age < 12) {
-		if (!(s->cargo_type == CT_PASSENGERS || s->cargo_type == CT_MAIL)) {
+		if (s->cargo_type != CT_PASSENGERS && s->cargo_type != CT_MAIL) {
 			SetDParam(1, STR_INDUSTRY);
 			SetDParam(2, s->from);
 			tile = GetIndustry(s->from)->xy;