Ticket #4012: placer_fix2016-6-28.diff

binaries/data/mods/public/maps/random/rmgen/library.js

@@ -6 +6 @@
 const HEIGHT_UNITS_PER_METRE = 92;
 const MIN_MAP_SIZE = 128;
 const MAX_MAP_SIZE = 512;
+const MAP_BORDER_WIDTH = 3;
 const FALLBACK_CIV = "athen";
 /**
  * Constants needed for heightmap_manipulation.js
@@ -283 +284 @@
 
 function placeObject(x, z, type, player, angle)
 {
-    if (g_Map.validT(x, z, 3))
+    if (g_Map.validT(x, z, MAP_BORDER_WIDTH))
         g_Map.addObject(new Entity(type, player, x, z, angle));
 }
 

binaries/data/mods/public/maps/random/rmgen/placer.js

@@ -453 +453 @@
             {
                 failCount++;
                 if (failCount > maxFailCount)
-                {
                     return undefined;
-                }
             }
         }
     }
@@ -555 +553 @@
             {
                 failCount++;
                 if (failCount > maxFailCount)
-                {
                     return undefined;
-                }
             }
         }
     }
@@ -602 +598 @@
         else
         {
             for (var j = 0; j < objs.length; ++j)
-            {
                 resultObjs.push(objs[j]);
-            }
         }
     }
     
@@ -612 +606 @@
     length = resultObjs.length;
     for (var i=0; i < length; i++)
     {
-        if (g_Map.validT(round(resultObjs[i].position.x/CELL_SIZE), round(resultObjs[i].position.z/CELL_SIZE), 3))
+        if (g_Map.validT(resultObjs[i].position.x / CELL_SIZE, resultObjs[i].position.z / CELL_SIZE, MAP_BORDER_WIDTH))
             g_Map.addObject(resultObjs[i]);
         
+        // Convert position to integer number of tiles
         if (this.tileClass !== undefined)
-        {   // Convert position to integer number of tiles
             this.tileClass.add(Math.floor(resultObjs[i].position.x/CELL_SIZE), Math.floor(resultObjs[i].position.z/CELL_SIZE));
-        }
     }
     
     return true;
@@ -653 +646 @@
     var placer = this.elements[randInt(this.elements.length)];
     
     var objs = placer.place(this.x, this.z, player, this.avoidSelf, constraint);
+    // Failure
     if (objs === undefined)
-    {   // Failure
+    {
         return false;
     }
     else
     {
         for (var j = 0; j < objs.length; ++j)
-        {
             resultObjs.push(objs[j]);
-        }
     }
     
     // Add placed objects to map
@@ -671 +663 @@
     {
         g_Map.addObject(resultObjs[i]);
         
+        // Convert position to integer number of tiles
         if (this.tileClass !== undefined)
-        {   // Convert position to integer number of tiles
             this.tileClass.add(Math.floor(resultObjs[i].position.x/CELL_SIZE), Math.floor(resultObjs[i].position.z/CELL_SIZE));
-        }
     }
     
     return true;

binaries/data/mods/public/maps/random/rmgen/terrain.js

@@ -31 +31 @@
 function SimpleTerrain(texture, treeType)
 {
     if (texture === undefined)
-    {
         throw("SimpleTerrain: texture not defined");
-    }
     
     this.texture = texture;
     this.treeType = treeType;
@@ -43 +41 @@
 SimpleTerrain.prototype.constructor = SimpleTerrain;
 SimpleTerrain.prototype.placeNew = function(x, z)
 {
-    if (this.treeType !== undefined && g_Map.validT(round(x), round(z), 3))
-    {
+    if (this.treeType !== undefined && g_Map.validT(round(x), round(z), MAP_BORDER_WIDTH))
         g_Map.terrainObjects[x][z] = new Entity(this.treeType, 0, x+0.5, z+0.5, randFloat()*TWO_PI);
-    }
     
     g_Map.texture[x][z] = g_Map.getTextureID(this.texture);
 };
@@ -63 +59 @@
 function RandomTerrain(terrains)
 {
     if (!(terrains instanceof Array) || !terrains.length)
-    {
         throw("RandomTerrain: Invalid terrains array");
-    }
     
     this.terrains = terrains;
 }