From b44e4e747d549a613c0206f042b4d30ff59b1164 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Mon, 30 Apr 2018 23:23:48 +0200
Subject: [PATCH] ships and items never have multi-stage builds. we are going
 to make sure of this soon.

---
 src/kernel/build.c | 1 -
 src/kernel/ship.c  | 5 -----
 src/move.c         | 2 --
 src/report.c       | 1 -
 4 files changed, 9 deletions(-)

diff --git a/src/kernel/build.c b/src/kernel/build.c
index ab2828873..bb6420717 100644
--- a/src/kernel/build.c
+++ b/src/kernel/build.c
@@ -642,7 +642,6 @@ message *msg_materials_required(unit * u, order * ord,
 
 int maxbuild(const unit * u, const construction * cons)
 /* calculate maximum size that can be built from available material */
-/* !! ignores maximum objectsize and improvements... */
 {
     int c;
     int maximum = INT_MAX;
diff --git a/src/kernel/ship.c b/src/kernel/ship.c
index 8b38f1375..3f4c099ac 100644
--- a/src/kernel/ship.c
+++ b/src/kernel/ship.c
@@ -328,7 +328,6 @@ int shipspeed(const ship * sh, const unit * u)
     assert(u->ship == sh);
     assert(u == ship_owner(sh));
     assert(sh->type->construction);
-    assert(sh->type->construction->improvement == NULL);  /* sonst ist construction::size nicht ship_type::maxsize */
 
     k = sh->type->range;
     if (sh->size != sh->type->construction->maxsize)
@@ -396,10 +395,6 @@ int shipcapacity(const ship * sh)
 {
     int i = sh->type->cargo;
 
-    /* sonst ist construction:: size nicht ship_type::maxsize */
-    assert(!sh->type->construction
-        || sh->type->construction->improvement == NULL);
-
     if (sh->type->construction && sh->size != sh->type->construction->maxsize)
         return 0;
 
diff --git a/src/move.c b/src/move.c
index bb6b9d212..3f940c78a 100644
--- a/src/move.c
+++ b/src/move.c
@@ -847,7 +847,6 @@ static void drifting_ships(region * r)
             /* Kapitän da? Beschädigt? Genügend Matrosen?
              * Genügend leicht? Dann ist alles OK. */
 
-            assert(sh->type->construction->improvement == NULL); /* sonst ist construction::size nicht ship_type::maxsize */
             if (captain && sh->size == sh->type->construction->maxsize
                 && enoughsailors(sh, crew_skill(sh)) && cansail(r, sh)) {
                 shp = &sh->next;
@@ -1669,7 +1668,6 @@ static bool ship_ready(const region * r, unit * u, order * ord)
         return false;
     }
     if (u->ship->type->construction) {
-        assert(!u->ship->type->construction->improvement);     /* sonst ist construction::size nicht ship_type::maxsize */
         if (u->ship->size != u->ship->type->construction->maxsize) {
             cmistake(u, ord, 15, MSG_MOVE);
             return false;
diff --git a/src/report.c b/src/report.c
index 319203e3b..c0b84f181 100644
--- a/src/report.c
+++ b/src/report.c
@@ -1803,7 +1803,6 @@ nr_ship(struct stream *out, const region *r, const ship * sh, const faction * f,
     if (wrptr(&bufp, &size, bytes) != 0)
         WARN_STATIC_BUFFER();
 
-    assert(sh->type->construction->improvement == NULL);  /* sonst ist construction::size nicht ship_type::maxsize */
     if (sh->size != sh->type->construction->maxsize) {
         bytes = snprintf(bufp, size, ", %s (%d/%d)",
             LOC(f->locale, "nr_undercons"), sh->size,