diff -Nur -X freeciv/diff_ignore freeciv/client/tilespec.c freeciv-mod/client/tilespec.c
--- freeciv/client/tilespec.c	Mon Sep 24 07:57:25 2001
+++ freeciv-mod/client/tilespec.c	Tue Oct  9 00:17:40 2001
@@ -1169,6 +1169,14 @@
 			  (ttype_west==T_MOUNTAINS || ttype_west==T_MOUNTAINS));
       *sprs++=sprites.tx.spec_mountain[tileno];
     }
+    
+    if (tspecial & S_IRRIGATION && !pcity && draw_irrigation) {
+      if (tspecial & S_FARMLAND) {
+	*sprs++=sprites.tx.farmland;
+      } else {
+	*sprs++=sprites.tx.irrigation;
+      }
+    }
 
     if (tspecial&S_RIVER) {
       tileno = INDEX_NSEW((tspecial_north&S_RIVER || ttype_north==T_OCEAN),
@@ -1192,25 +1200,25 @@
     *solid_bg = 1;
   }
 
-  if (draw_specials) {
-    if (tspecial & S_SPECIAL_1)
-      *sprs++ = tile_types[ttype].special[0].sprite;
-    else if (tspecial & S_SPECIAL_2)
-      *sprs++ = tile_types[ttype].special[1].sprite;
-  }
-
   if (tspecial & S_MINE && draw_mines) {
     /* We do not have an oil tower in isometric view yet... */
     *sprs++ = sprites.tx.mine;
   }

-  if (tspecial & S_IRRIGATION && !pcity && draw_irrigation) {
+  if (tspecial & S_IRRIGATION && !pcity && draw_irrigation && !draw_terrain) {
     if (tspecial & S_FARMLAND) {
       *sprs++=sprites.tx.farmland;
     } else {
       *sprs++=sprites.tx.irrigation;
     }
   }
+  
+  if (draw_specials) {
+    if (tspecial & S_SPECIAL_1)
+      *sprs++ = tile_types[ttype].special[0].sprite;
+    else if (tspecial & S_SPECIAL_2)
+      *sprs++ = tile_types[ttype].special[1].sprite;
+  }
 
   if (tspecial & S_RAILROAD && draw_roads_rails) {
     int found = 0;
@@ -1417,6 +1425,11 @@
     if(tspecial_east&S_RIVER || ttype_east==T_RIVER)
       *sprs++ = sprites.tx.river_outlet[DIR_EAST];
   }
+  
+  if(tspecial & S_IRRIGATION && draw_irrigation) {
+    if(tspecial & S_FARMLAND) *sprs++=sprites.tx.farmland;
+    else *sprs++=sprites.tx.irrigation;
+  }
 
   if (tspecial&S_RIVER && draw_terrain) {
     tileno = INDEX_NSEW((tspecial_north&S_RIVER || ttype_north==T_OCEAN),
@@ -1424,11 +1437,6 @@
 			(tspecial_east&S_RIVER  || ttype_east==T_OCEAN),
 			(tspecial_west&S_RIVER  || ttype_west== T_OCEAN));
     *sprs++=sprites.tx.spec_river[tileno];
-  }
-
-  if(tspecial & S_IRRIGATION && draw_irrigation) {
-    if(tspecial & S_FARMLAND) *sprs++=sprites.tx.farmland;
-    else *sprs++=sprites.tx.irrigation;
   }
 
   if(((tspecial & S_ROAD) || (tspecial & S_RAILROAD)) && draw_roads_rails) {