From f8fd13dea17388f7d65fdb52656c5d307608f171 Mon Sep 17 00:00:00 2001 From: planetmaker Date: Sun, 20 Jan 2013 16:17:24 +0000 Subject: (svn r24927) -Cleanup [FS#5440]: No need to check a positive value to be larger than 0 --- src/economy.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/economy.cpp b/src/economy.cpp index d9229351d..ea59be708 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -560,16 +560,16 @@ static void CompanyCheckBankrupt(Company *c) /* 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 -- cgit v1.2.3-70-g09d2