? typescript
? wo_me_p
? diff.diff
? ffff
? tidying.diff
? xyzzy
? gmon.out
? tidying2.diff
? map.diff
? msc.diff
? nohup.out
? Cdiff.diff
? formatting.diff
? with_me_p
? zappa
? gmon.out-CVS-20010809
? gmon.out-CVS-20010809.txt.bz2
? gmon.out-CVS-no-map-adjx-20010809
? cc.diff
? adjc_dir_iterate3.diff
? gmon.out-CVS-no-map-adjx-20010809.txt.bz2
? gmon.out.txt.bz2
? CCdiff.diff
? coordfix.diff
? shithappens.diff
? shithappens2.diff
? ai/aiunit.c.save
? client/gui-mui/zappa
? common/fitte.diff
? common/PANAMA.diff
? server/zappa
? server/1
? server/nohup.out
Index: ai/aiunit.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/aiunit.c,v
retrieving revision 1.156
diff -u -r1.156 aiunit.c
--- ai/aiunit.c	2001/09/15 15:31:18	1.156
+++ ai/aiunit.c	2001/09/23 00:23:29
@@ -791,7 +791,7 @@
   int search_dist = real_map_distance(pc->x, pc->y, punit->x, punit->y) - 1;
   
   square_iterate(punit->x, punit->y, search_dist, xx, yy) {
-    if (map_same_continent(xx, yy, pc->x, pc->y)
+    if (map_get_continent(xx, yy) == map_get_continent(pc->x, pc->y)
         && real_map_distance(punit->x, punit->y, xx, yy) < dist) {
 
       dist = real_map_distance(punit->x, punit->y, xx, yy);
@@ -1578,8 +1578,9 @@
        /* A caravan without a home?  Kinda strange, but it might happen.  */
        pcity=player_find_city_by_id(pplayer, punit->homecity);
        city_list_iterate(pplayer->cities,pdest)
-         if (pcity && can_establish_trade_route(pcity,pdest) &&
-            map_same_continent(pcity->x, pcity->y, pdest->x, pdest->y)) {
+         if (pcity
+             && can_establish_trade_route(pcity, pdest)
+             && map_get_continent(pcity->x, pcity->y) == map_get_continent(pdest->x, pdest->y)) {
            tradeval=trade_between_cities(pcity, pdest);
            if (tradeval) {
              if (best < tradeval) {
@@ -2192,7 +2193,8 @@
 
   if (closest_unit != NULL
       && !same_pos(closest_unit->x, closest_unit->y, leader->x, leader->y)
-      && map_same_continent(leader->x, leader->y, closest_unit->x, closest_unit->y)) {
+      && (map_get_continent(leader->x, leader->y)
+          == map_get_continent(closest_unit->x, closest_unit->y))) {
     auto_settler_do_goto(pplayer, leader, closest_unit->x, closest_unit->y);
     handle_unit_activity_request(leader, ACTIVITY_IDLE);
     return; /* sticks better to own units with this -- jk */
Index: client/gui-gtk/cityrep.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/cityrep.c,v
retrieving revision 1.43
diff -u -r1.43 cityrep.c
--- client/gui-gtk/cityrep.c	2001/09/19 18:48:47	1.43
+++ client/gui-gtk/cityrep.c	2001/09/23 00:23:31
@@ -588,8 +588,8 @@
       for(; current; current = g_list_next(current))
 	{
 	  struct city* selectedcity = current->data;
-	  if (map_same_continent(pcity->x,pcity->y,
-				 selectedcity->x,selectedcity->y))
+          if (map_get_continent(pcity->x, pcity->y)
+              == map_get_continent(selectedcity->x, selectedcity->y))
 	    {
 	      gtk_clist_select_row(GTK_CLIST(city_list),i,0);
 	      break;
Index: client/gui-win32/cityrep.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/cityrep.c,v
retrieving revision 1.4
diff -u -r1.4 cityrep.c
--- client/gui-win32/cityrep.c	2001/09/20 11:07:29	1.4
+++ client/gui-win32/cityrep.c	2001/09/23 00:23:31
@@ -597,8 +597,8 @@
 	{
 	  struct city *selectedcity;
 	  selectedcity=(struct city *)ListBox_GetItemData(hLst,cityids[j]);
-	  if (map_same_continent(pcity->x,pcity->y,
-                                 selectedcity->x,selectedcity->y))
+          if (map_get_continent(pcity->x, pcity->y)
+              == map_get_continent(selectedcity->x, selectedcity->y))
 	    {    
 	      ListBox_SetSel(hLst,TRUE,i);
 	      break;
Index: common/map.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/map.c,v
retrieving revision 1.89
diff -u -r1.89 map.c
--- common/map.c	2001/09/16 09:38:07	1.89
+++ common/map.c	2001/09/23 00:23:31
@@ -433,14 +433,6 @@
 }
 
 /***************************************************************
-...
-***************************************************************/
-int map_same_continent(int x1, int y1, int x2, int y2)
-{
-  return (map_get_continent(x1,y1) == map_get_continent(x2,y2));
-}
-
-/***************************************************************
   Returns 1 if (x,y) is _not_ a good position to start from;
   Bad places:
   - Non-suitable terrain;
@@ -472,7 +464,7 @@
   for (i=0;i<nr;i++) {
     int x1 = map.start_positions[i].x;
     int y1 = map.start_positions[i].y;
-    if (map_same_continent(x, y, x1, y1)
+    if (map_get_continent(x, y) == map_get_continent(x1, y1)
 	&& real_map_distance(x, y, x1, y1) < dist) {
       return 1;
     }
Index: common/map.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/map.h,v
retrieving revision 1.92
diff -u -r1.92 map.h
--- common/map.h	2001/09/16 09:38:08	1.92
+++ common/map.h	2001/09/23 00:23:31
@@ -186,7 +186,6 @@
 
 void map_set_continent(int x, int y, int val);
 signed short map_get_continent(int x, int y);
-int map_same_continent(int x1, int y1, int x2, int y2);
 
 void initialize_move_costs(void);
 void reset_move_costs(int x, int y);
Index: server/gamehand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/gamehand.c,v
retrieving revision 1.96
diff -u -r1.96 gamehand.c
--- server/gamehand.c	2001/09/16 12:43:30	1.96
+++ server/gamehand.c	2001/09/23 00:23:31
@@ -112,11 +112,11 @@
 	  dx = x + myrand(2 * game.dispersion + 1) - game.dispersion;
 	  dy = y + myrand(2 * game.dispersion + 1) - game.dispersion;
 	  normalize_map_pos(&dx, &dy);
-	} while (!(is_real_tile(dx, dy) &&
-		   map_same_continent(x, y, dx, dy) &&
-		   (map_get_terrain(dx, dy) != T_OCEAN) &&
-		   !is_non_allied_unit_tile(map_get_tile(dx, dy),
-					    get_player(i))));
+	} while (!(is_real_tile(dx, dy)
+                   && map_get_continent(x, y) == map_get_continent(dx, dy)
+                   && map_get_terrain(dx, dy) != T_OCEAN
+                   && !is_non_allied_unit_tile(map_get_tile(dx, dy),
+                    			       get_player(i))));
       }
       /* For scenarios or dispersion, huts may coincide with player
 	 starts (in other cases, huts are avoided as start positions).