[Bug] Mail level

[jamespetts]

One of the recent commits to the SVN is in the following terms:

// always use normal amount for return pas/mail
-                  // (for mail pax.menge might have been smaller!)
-                  return_pax.menge = pax_left_to_do;
+                  if(  will_return != town_return  &&  wtyp==warenbauer_t::post  ) {
+                     // attractions/factory generate more mail than they recieve
+                     return_pax.menge = pax_left_to_do*3;
+                  }
+                  else {
+                     // use normal amount for return pas/mail
+                     return_pax.menge = pax_left_to_do*3;
+                  }

However, this cannot be right, as both halves of the conditional do exactly the same thing: see the lines in bold. Presumably, the second version should not multiply by 3, so as to make this code:

// always use normal amount for return pas/mail
-                  // (for mail pax.menge might have been smaller!)
-                  return_pax.menge = pax_left_to_do;
+                  if(  will_return != town_return  &&  wtyp==warenbauer_t::post  ) {
+                     // attractions/factory generate more mail than they recieve
+                     return_pax.menge = pax_left_to_do*3;
+                  }
+                  else {
+                     // use normal amount for return pas/mail
+                     return_pax.menge = pax_left_to_do;
+                  }

[prissi]

Thanks