? grid.diff ? working.diff.gz ? temp.diff ? data/hires/schmaus@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Index: client/climisc.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/climisc.c,v retrieving revision 1.55 diff -u -r1.55 climisc.c --- client/climisc.c 2001/08/29 12:01:36 1.55 +++ client/climisc.c 2001/08/29 15:43:31 @@ -509,11 +509,16 @@ get_worker_on_map_position(x1, y1, &city_tile_type1, &dummy_pcity); get_worker_on_map_position(x2, y2, &city_tile_type2, &dummy_pcity); - if (city_tile_type1 == C_TILE_WORKER || city_tile_type2 == C_TILE_WORKER) { + if ((city_tile_type1 == C_TILE_WORKER || city_tile_type2 == C_TILE_WORKER) && + !(city_tile_type1 == C_TILE_WORKER && city_tile_type2 == C_TILE_WORKER)){ return COLOR_STD_RED; - } else { + } + if ((pos1_is_in_city_radius || pos2_is_in_city_radius) && + !(pos1_is_in_city_radius && pos2_is_in_city_radius)) { return COLOR_STD_WHITE; } + + return COLOR_STD_BLACK; } /**************************************************************************