diff -Nur -X/home/thue/freeciv-dev/freeciv/diff_ignore freeciv/server/settlers.c workdir/server/settlers.c
--- freeciv/server/settlers.c	Sun Jun  4 23:18:04 2000
+++ workdir/server/settlers.c	Mon Jun  5 22:47:33 2000
@@ -1225,12 +1225,11 @@
         punit->ai.ferryboat = 0;
       }
     }
-  } else punit->ai.control=0;
+  }
 
   if (punit->ai.control
       && punit->moves_left
       && punit->activity == ACTIVITY_IDLE) {
-    /* if players can build with 0 moves left, so should the AI */
     if (same_pos(gx, gy, punit->x, punit->y)) {
       if (best_act == ACTIVITY_UNKNOWN) {
         remove_city_from_minimap(gx, gy); /* yeah, I know. -- Syela */
@@ -1310,11 +1309,11 @@
         ptile->assigned = ptile->assigned | i; /* assigned for us only */
       } else {
         ptile = map_get_tile(punit->x, punit->y);
-        ptile->assigned = 32767; /* assigned for everyone */
+        ptile->assigned = 0xFFFFFFFF; /* assigned for everyone */
       }
     } else {
       ptile = map_get_tile(punit->x, punit->y);
-      ptile->assigned = ptile->assigned | (32767 ^ i); /* assigned for everyone else */
+      ptile->assigned = ptile->assigned | (0xFFFFFFFF ^ i); /* assigned for everyone else */
     }
   unit_list_iterate_end;
 }