From db8f2f7d0cdcad0235db16e524b3adabcaccb11d Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 2 Sep 2010 23:25:25 -0700 Subject: [PATCH] do not damage ships with no owner while still in production --- src/gamecode/laws.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/gamecode/laws.c b/src/gamecode/laws.c index 515da34d3..232637508 100644 --- a/src/gamecode/laws.c +++ b/src/gamecode/laws.c @@ -2659,12 +2659,15 @@ sinkships(region * r) while (*shp) { ship * sh = *shp; - if (fval(r->terrain, SEA_REGION) && (!enoughsailors(sh, r) || get_captain(sh)==NULL)) { - /* Schiff nicht seetüchtig */ - damage_ship(sh, 0.30); - } - if (shipowner(sh)==NULL) { - damage_ship(sh, 0.05); + + if (!sh->type->construction || sh->size>=sh->type->construction->maxsize) { + if (fval(r->terrain, SEA_REGION) && (!enoughsailors(sh, r) || get_captain(sh)==NULL)) { + /* Schiff nicht seetüchtig */ + damage_ship(sh, 0.30); + } + if (shipowner(sh)==NULL) { + damage_ship(sh, 0.05); + } } if (sh->damage >= sh->size * DAMAGE_SCALE) { remove_ship(shp, sh);