changeset 19995:122c90e4e79d draft

(svn r24927) -Cleanup [FS#5440]: No need to check a positive value to be larger than 0
author planetmaker <planetmaker@openttd.org>
date Sun, 20 Jan 2013 16:17:24 +0000
parents f2bda548c536
children f36a8cc913d3
files src/economy.cpp
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -560,16 +560,16 @@
 
 		/* Offer company for sale after 6 months */
 		case 7: {
-			/* Check if the company has any value. If not, declare it bankrupt
-			 *  right now */
+			/* Don't consider the loan */
 			Money val = CalculateCompanyValue(c, false);
-			if (val > 0) {
-				c->bankrupt_value = val;
-				c->bankrupt_asked = 1 << c->index; // Don't ask the owner
-				c->bankrupt_timeout = 0;
-				break;
-			}
-			/* FALL THROUGH  to case 10 */
+
+			c->bankrupt_value = val;
+			c->bankrupt_asked = 1 << c->index; // Don't ask the owner
+			c->bankrupt_timeout = 0;
+
+			/* The company assets should always have some value */
+			assert(c->bankrupt_value > 0);
+			break;
 		}
 
 		/* Bankrupt company after 6 months (if the company has no value) or latest