? civscore.log
? rand_pos.diff
? title.diff
? diff
? tinydent-1.11.4.tar.gz
? null_flags1.diff
? map_iterate.diff
? map_iterate2.diff
? data/tinydent
? data/tinydent.tilespec
? data/tinydent.mod
? data/tinydent1.diff
Index: server/mapgen.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/mapgen.c,v
retrieving revision 1.76
diff -u -r1.76 mapgen.c
--- server/mapgen.c	2001/10/30 10:59:20	1.76
+++ server/mapgen.c	2001/11/11 16:18:41
@@ -1424,7 +1424,7 @@
 /**************************************************************************
   globals for generator 2 & 3
 **************************************************************************/
-static int isleindex, n, e, s, w;
+static int isleindex, gv_n, gv_e, gv_s, gv_w;
 static long int totalmass; /* better a global than a duplicate formula */
 
 static int is_cold(int x, int y){
@@ -1450,15 +1450,15 @@
   *bucket -= i * capac;
 
   k= i;
-  failsafe= i*(s-n)*(e-w);
+  failsafe= i*(gv_s-gv_n)*(gv_e-gv_w);
   if(failsafe<0){ failsafe= -failsafe; }
 
   if(warm0_weight+warm1_weight+cold0_weight+cold1_weight<=0)
     i= 0;
 
   while (i && failsafe--) {
-    y = myrand(s - n) + n;
-    x = myrand(e - w) + w;
+    y = myrand(gv_s - gv_n) + gv_n;
+    x = myrand(gv_e - gv_w) + gv_w;
     if (map_get_continent(x,y) == isleindex &&
 		map_get_terrain(x,y) == T_GRASSLAND) {
 
@@ -1506,12 +1506,12 @@
   *bucket -= i * capac;
 
   k= i;
-  failsafe= i*(s-n)*(e-w);
+  failsafe= i*(gv_s-gv_n)*(gv_e-gv_w);
   if(failsafe<0){ failsafe= -failsafe; }
 
   while (i && failsafe--) {
-    y = myrand(s - n) + n;
-    x = myrand(e - w) + w;
+    y = myrand(gv_s - gv_n) + gv_n;
+    x = myrand(gv_e - gv_w) + gv_w;
     if (map_get_continent(x,y) == isleindex &&
 		map_get_terrain(x,y) == T_GRASSLAND) {
 
@@ -1546,30 +1546,30 @@
   rand_map_pos(&xo, &yo);
 
   /* this helps a lot for maps with high landmass */
-  for (y = n, x = w ; y < s && x < e ; y++, x++) {
-    int map_x = x + xo - w;
-    int map_y = y + yo - n;
+  for (y = gv_n, x = gv_w ; y < gv_s && x < gv_e ; y++, x++) {
+    int map_x = x + xo - gv_w;
+    int map_y = y + yo - gv_n;
     if (!normalize_map_pos(&map_x, &map_y))
       return 0;
     if (hmap(x, y) && is_coastline(map_x, map_y))
       return 0;
   }
 		       
-  for (y = n ; y < s ; y++)
-    for (x = w ; x < e ; x++) {
-      int map_x = x + xo - w;
-      int map_y = y + yo - n;
+  for (y = gv_n ; y < gv_s ; y++)
+    for (x = gv_w ; x < gv_e ; x++) {
+      int map_x = x + xo - gv_w;
+      int map_y = y + yo - gv_n;
       if (!normalize_map_pos(&map_x, &map_y))
 	return 0;
       if (hmap(x, y) && is_coastline(map_x, map_y))
 	return 0;
     }
 
-  for (y = n ; y < s ; y++) 
-    for (x = w ; x < e ; x++) {
+  for (y = gv_n ; y < gv_s ; y++) {
+    for (x = gv_w ; x < gv_e ; x++) {
       if (hmap(x, y)) {
-	int map_x = x + xo - w;
-	int map_y = y + yo - n;
+	int map_x = x + xo - gv_w;
+	int map_y = y + yo - gv_n;
 	int is_real;
 
 	is_real = normalize_map_pos(&map_x, &map_y);
@@ -1586,10 +1586,9 @@
         i++;
       }
     }
-  s += yo - n;
-  e += xo - w;
-  n = yo;
-  w = xo;
+  }
+  assert(i):
+
   return i;
 }
 
@@ -1605,25 +1604,25 @@
   y = map.ysize / 2;
   x = map.xsize / 2;
   hmap(x, y) = 1;
-  n = y - 1; w = x - 1;
-  s = y + 2; e = x + 2;
+  gv_n = y - 1; gv_w = x - 1;
+  gv_s = y + 2; gv_e = x + 2;
   i = islemass - 1;
   while (i && tries-->0) {
-    y = myrand(s - n) + n;
-    x = myrand(e - w) + w;
+    y = myrand(gv_s - gv_n) + gv_n;
+    x = myrand(gv_e - gv_w) + gv_w;
     if ((!hmap(x, y)) && (
 		hmap(x+1, y) || hmap(x-1, y) ||
 		hmap(x, y+1) || hmap(x, y-1) )) {
       hmap(x, y) = 1;
       i--;
-      if (y >= s - 1 && s < map.ysize - 2) s++;
-      if (x >= e - 1 && e < map.xsize - 2) e++;
-      if (y <= n && n > 2) n--;
-      if (x <= w && w > 2) w--;
+      if (y >= gv_s - 1 && gv_s < map.ysize - 2) gv_s++;
+      if (x >= gv_e - 1 && gv_e < map.xsize - 2) gv_e++;
+      if (y <= gv_n && gv_n > 2) gv_n--;
+      if (x <= gv_w && gv_w > 2) gv_w--;
     }
     if (i < islemass / 10) {
-      for (y = n ; y < s ; y++)
-        for (x = w ; x < e ; x++)
+      for (y = gv_n ; y < gv_s ; y++)
+        for (x = gv_w ; x < gv_e ; x++)
           if ((!hmap(x, y)) && i && (
 		hmap(x+1, y) && hmap(x-1, y) &&
 		hmap(x, y+1) && hmap(x, y-1) )) {