From: Markus Armbruster <armbru@pond.sub.org>
Date: Fri, 25 Feb 2011 07:08:05 +0000 (+0100)
Subject: Optimize dodistribute() for sectors with no distribution center
X-Git-Tag: v4.3.27~104
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=b8002d560345127ea4f3a1ba06fe7a7ff8bbb7d6

Optimize dodistribute() for sectors with no distribution center

import_cost is now -1 in that case, so checking that suffices.
---

diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c
index 7e94812cd..62a6273ca 100644
--- a/src/lib/update/distribute.c
+++ b/src/lib/update/distribute.c
@@ -70,9 +70,6 @@ dodistribute(struct sctstr *sp, int imex, double import_cost)
     int rplague;
     int lplague;
 
-    if ((sp->sct_dist_x == sp->sct_x) && (sp->sct_dist_y == sp->sct_y))
-	return 0;
-
     if (imex == IMPORT && import_cost < 0.0)
 	return 0;
 
@@ -82,7 +79,7 @@ dodistribute(struct sctstr *sp, int imex, double import_cost)
     else {
 	dcc = sector_mcost(dist, MOB_MOVE);
 	if (import_cost < 0.0 || dcc < 0.0) {
-	    if (sp->sct_own != 0)
+	    if (sp->sct_own && sp->sct_uid != dist->sct_uid)
 		wu(0, sp->sct_own, "No path to dist sector for %s\n",
 		   ownxy(sp));
 	    return 0;