Move getMapSize to the RandomMap object, refs #4964.

This was SVN commit r20997.

binaries/data/mods/public/maps/random/african_plains.js

@@ -44,7 +44,7 @@ var heightCliff = 3;
 var g_Map = new RandomMap(heightLand, tPrimary);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 
 var clPlayer = createTileClass();
 var clHill = createTileClass();

binaries/data/mods/public/maps/random/alpine_lakes.js

@@ -86,7 +86,7 @@ var heightLand = 3;
 var g_Map = new RandomMap(heightLand, tPrimary);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 
 var clPlayer = createTileClass();
 var clHill = createTileClass();

binaries/data/mods/public/maps/random/ardennes_forest.js

@@ -56,7 +56,7 @@ const heightOffsetRavine = 10;
 var g_Map = new RandomMap(heightHill, tPrimary);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/belgian_uplands.js

@@ -9,7 +9,7 @@ const heightLand = 0;
 var g_Map = new RandomMap(heightLand, tPrimary);
 
 var numPlayers = getNumPlayers();
-var mapSize = getMapSize();
+var mapSize = g_Map.getSize();
 var mapCenter = g_Map.getCenter();
 
 // Function to apply a heightmap

binaries/data/mods/public/maps/random/cantabrian_highlands.js

@@ -49,7 +49,7 @@ const heightHill = 20;
 var g_Map = new RandomMap(heightLand, tPrimary);
 
 var numPlayers = getNumPlayers();
-var mapSize = getMapSize();
+var mapSize = g_Map.getSize();
 
 var clPlayer = createTileClass();
 var clHill = createTileClass();

binaries/data/mods/public/maps/random/canyon.js

@@ -46,7 +46,7 @@ const heightHill = 30;
 var g_Map = new RandomMap(heightHill, tMainTerrain);
 
 var numPlayers = getNumPlayers();
-var mapSize = getMapSize();
+var mapSize = g_Map.getSize();
 var mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/continent.js

@@ -46,7 +46,7 @@ const heightLand = 3;
 var g_Map = new RandomMap(heightSeaGround, tWater);
 
 var numPlayers = getNumPlayers();
-var mapSize = getMapSize();
+var mapSize = g_Map.getSize();
 var mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/corinthian_isthmus.js

@@ -47,7 +47,7 @@ var heightLand = 3;
 var g_Map = new RandomMap(heightLand, tHill);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/corsica.js

@@ -52,7 +52,7 @@ var heightOffsetAntiBumps = -5;
 var g_Map = new RandomMap(heightSeaGround, tVeryDeepWater);
 
 var numPlayers = getNumPlayers();
-var mapSize = getMapSize();
+var mapSize = g_Map.getSize();
 var mapCenter = g_Map.getCenter();
 
 var clIsland = createTileClass();

binaries/data/mods/public/maps/random/cycladic_archipelago.js

@@ -50,7 +50,7 @@ const heightOffsetBump = 2;
 var g_Map = new RandomMap(heightSeaGround, tWater);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clCoral = createTileClass();

binaries/data/mods/public/maps/random/danubius.js

@@ -128,7 +128,7 @@ const heightIsland = 6;
 var g_Map = new RandomMap(heightLand, tPrimary);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 const mapBounds = g_Map.getBounds();
 

binaries/data/mods/public/maps/random/deep_forest.js

@@ -29,7 +29,7 @@ var heightOffsetRandomPath = 1;
 
 var g_Map = new RandomMap(heightLand, terrainPrimary);
 
-var mapSize = getMapSize();
+var mapSize = g_Map.getSize();
 var mapRadius = mapSize/2;
 var mapCenter = g_Map.getCenter();
 

binaries/data/mods/public/maps/random/flood.js

@@ -63,7 +63,7 @@ const clFood = createTileClass();
 const clBaseResource = createTileClass();
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 log("Creating player islands...")

binaries/data/mods/public/maps/random/fortress.js

@@ -46,7 +46,7 @@ var heightLand = 3;
 var g_Map = new RandomMap(heightLand, tGrass);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 
 var clPlayer = createTileClass();
 var clHill = createTileClass();

binaries/data/mods/public/maps/random/gear.js

@@ -51,7 +51,7 @@ var heightHill = 20;
 var g_Map = new RandomMap(heightLand, tMainTerrain);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/guadalquivir_river.js

@@ -43,7 +43,7 @@ var heightLand = 3;
 var g_Map = new RandomMap(heightSeaGround, tWater);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 const mapBounds = g_Map.getBounds();
 

binaries/data/mods/public/maps/random/gulf_of_bothnia.js

@@ -139,7 +139,7 @@ const pForest = [tForestFloor + TERRAIN_SEPARATOR + oPine, tForestFloor];
 var g_Map = new RandomMap(heightLand, tPrimary);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/harbor.js

@@ -20,7 +20,7 @@ createArea(
 
 Engine.SetProgress(10);
 
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 const startAngle = randomAngle();

binaries/data/mods/public/maps/random/hells_pass.js

@@ -268,7 +268,7 @@ function placeBarriers()
 		var mOffset = 0.5;
 		var mTaper = -1.5;
 
-		if (spineCount > 3 || getMapSize() <= 192)
+		if (spineCount > 3 || g_Map.getSize() <= 192)
 		{
 			mWaviness = 0.2;
 			mOffset = 0.2;

binaries/data/mods/public/maps/random/india.js

@@ -30,7 +30,7 @@ const heightOffsetBump = 2;
 var g_Map = new RandomMap(heightLand, tGrass1);
 
 var numPlayers = getNumPlayers();
-var mapSize = getMapSize();
+var mapSize = g_Map.getSize();
 var mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/island_stronghold.js

@@ -52,7 +52,7 @@ const heightHill = 18;
 var g_Map = new RandomMap(heightSeaGround, tWater);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 const clPlayer = createTileClass();

binaries/data/mods/public/maps/random/islands.js

@@ -52,7 +52,7 @@ const heightHill = 18;
 var g_Map = new RandomMap(heightSeaGround, tWater);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/lake.js

@@ -46,7 +46,7 @@ const heightLand = 3;
 var g_Map = new RandomMap(heightLand, tMainTerrain);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/latium.js

@@ -57,7 +57,7 @@ const heightHill = 12;
 var g_Map = new RandomMap(heightLand, tGrass);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 const mapBounds = g_Map.getBounds();
 

binaries/data/mods/public/maps/random/lorraine_plain.js

@@ -44,7 +44,7 @@ const heightOffsetBump = 2;
 var g_Map = new RandomMap(heightLand, tPrimary);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 const mapBounds = g_Map.getBounds();
 

binaries/data/mods/public/maps/random/migration.js

@@ -50,7 +50,7 @@ const heightOffsetBump = 2;
 var g_Map = new RandomMap(heightSeaGround, tWater);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/neareastern_badlands.js

@@ -48,7 +48,7 @@ const heightOffsetBump = 2;
 var g_Map = new RandomMap(heightLand, tPrimary);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/northern_lights.js

@@ -34,7 +34,7 @@ const heightHill = 25;
 var g_Map = new RandomMap(heightLand, tSnowA);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 const mapBounds = g_Map.getBounds();
 

binaries/data/mods/public/maps/random/oasis.js

@@ -45,7 +45,7 @@ const heightOffsetDune = 18;
 var g_Map = new RandomMap(heightLand, tSand);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/persian_highlands.js

@@ -53,7 +53,7 @@ const heightOffsetValley = -10;
 var g_Map = new RandomMap(heightLand, tDirtMain);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/phoenician_levant.js

@@ -49,7 +49,7 @@ const heightOffsetBump = 2;
 var g_Map = new RandomMap(heightLand, tHill);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 const mapBounds = g_Map.getBounds();
 

binaries/data/mods/public/maps/random/polar_sea.js

@@ -34,7 +34,7 @@ var heightCliff = 3;
 var g_Map = new RandomMap(heightLand, tPrimary);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/pyrenean_sierra.js

@@ -71,7 +71,7 @@ const heightOffsetHillRandom = 2;
 var g_Map = new RandomMap(heightInit, tGrass);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clDirt = createTileClass();

binaries/data/mods/public/maps/random/rivers.js

@@ -53,7 +53,7 @@ const heightLand = 1;
 var g_Map = new RandomMap(heightLand, tMainTerrain);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

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

@@ -46,7 +46,7 @@ function createHills(terrainset, constraint, tileClass, count, minSize, maxSize,
 function createMountains(terrain, constraint, tileClass, count, maxHeight, minRadius, maxRadius, numCircles)
 {
 	log("Creating mountains...");
-	let mapSize = getMapSize();
+	let mapSize = g_Map.getSize();
 
 	for (let i = 0; i < (count || scaleByMapSize(1, 4) * getNumPlayers()); ++i)
 		createMountain(
@@ -73,7 +73,7 @@ function createMountain(maxHeight, minRadius, maxRadius, numCircles, constraints
 	if (!g_Map.inMapBounds(position) || !constraint.allows(position))
 		return;
 
-	let mapSize = getMapSize();
+	let mapSize = g_Map.getSize();
 	let queueEmpty = !q.length;
 
 	let gotRet = [];
@@ -361,7 +361,7 @@ function paintRiver(args)
 	let riverMaxX = Math.max(args.start.x, args.end.x);
 	let riverMaxZ = Math.max(args.start.y, args.end.y);
 
-	let mapSize = getMapSize();
+	let mapSize = g_Map.getSize();
 	for (let ix = 0; ix < mapSize; ++ix)
 		for (let iz = 0; iz < mapSize; ++iz)
 		{
@@ -458,7 +458,7 @@ function createTributaryRivers(riverAngle, riverCount, riverWidth, heightRiverbe
 	let tapering = 0.05;
 	let heightShallow = -2;
 
-	let mapSize = getMapSize();
+	let mapSize = g_Map.getSize();
 	let mapCenter = g_Map.getCenter();
 	let mapBounds = g_Map.getBounds();
 
@@ -534,7 +534,7 @@ function createTributaryRivers(riverAngle, riverCount, riverWidth, heightRiverbe
  */
 function createPassage(args)
 {
-	let bound = x => Math.max(0, Math.min(Math.round(x), getMapSize()));
+	let bound = x => Math.max(0, Math.min(Math.round(x), g_Map.getSize()));
 
 	let startHeight = args.startHeight !== undefined ? args.startHeight : g_Map.getHeight(new Vector2D(bound(args.start.x), bound(args.start.y)));
 	let endHeight = args.endHeight !== undefined ? args.endHeight : g_Map.getHeight(new Vector2D(bound(args.end.x), bound(args.end.y)));

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

@@ -261,7 +261,7 @@ function createObjectGroup(group, player, constraints)
 	return group.place(player, new AndConstraint(constraints));
 }
 
-function getMapSize()
+function g_Map.getSize()
 {
 	return g_Map.size;
 }

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

@@ -83,7 +83,7 @@ LayeredPainter.prototype.paint = function(area)
 	breadthFirstSearchPaint({
 		"area": area,
 		"brushSize": 1,
-		"gridSize": getMapSize(),
+		"gridSize": g_Map.getSize(),
 		"withinArea": (areaID, position) => g_Map.area[position.x][position.y] == areaID,
 		"paintTile": (point, distance) => {
 			let width = 0;

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

@@ -36,7 +36,7 @@ ClumpPlacer.prototype.place = function(constraint)
 
 	var retVec = [];
 
-	var size = getMapSize();
+	var size = g_Map.getSize();
 	var gotRet = new Array(size).fill(0).map(p => new Uint8Array(size)); // booleans
 	var radius = Math.sqrt(this.size / Math.PI);
 	var perim = 4 * radius * 2 * Math.PI;
@@ -150,7 +150,7 @@ ChainPlacer.prototype.place = function(constraint)
 		return undefined;
 
 	var retVec = [];
-	var size = getMapSize();
+	var size = g_Map.getSize();
 	var failed = 0, count = 0;
 	var queueEmpty = !this.q.length;
 

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

@@ -9,7 +9,7 @@
  */
 function RectPlacer(x1, z1, x2, z2)
 {
-	let mapSize = getMapSize();
+	let mapSize = g_Map.getSize();
 
 	this.x1 = Math.round(Math.max(Math.min(x1, x2), 0));
 	this.x2 = Math.round(Math.min(Math.max(x1, x2), mapSize - 1));
@@ -74,7 +74,7 @@ function HeightPlacer(mode, minElevation, maxElevation)
 
 HeightPlacer.prototype.place = function(constraint)
 {
-	let mapSize = getMapSize();
+	let mapSize = g_Map.getSize();
 	let points = [];
 
 	for (let x = 0; x < mapSize; ++x)
@@ -127,7 +127,7 @@ PathPlacer.prototype.place = function(constraint)
 	var totalSteps = numSteps*numISteps;
 	var offset = 1 + Math.floor(pathLength / 4 * this.c);
 
-	var size = getMapSize();
+	var size = g_Map.getSize();
 	var gotRet = [];
 	for (var i = 0; i < size; ++i)
 		gotRet[i] = new Uint8Array(size);			// bool / uint8

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

@@ -84,7 +84,7 @@ function placeCivDefaultStartingEntities(location, playerID, wallType, dist = 6,
 function placeStartingWalls(x, z, playerID, wallType, orientation = BUILDING_ORIENTATION)
 {
 	let civ = getCivCode(playerID);
-	if (civ != "iber" || getMapSize() <= 128)
+	if (civ != "iber" || g_Map.getSize() <= 128)
 		return;
 
 	if (wallType == "towers")
@@ -543,7 +543,7 @@ function playerPlacementRiver(angle, width, center = undefined)
 {
 	let numPlayers = getNumPlayers();
 	let numPlayersEven = numPlayers % 2 == 0;
-	let mapSize = getMapSize();
+	let mapSize = g_Map.getSize();
 	let centerPosition = center || g_Map.getCenter();
 	let playerPosition = [];
 

binaries/data/mods/public/maps/random/rmgen2/gaia.js

@@ -1121,7 +1121,7 @@ function findClearLine(bb, corners, angle, baseHeight)
 function findCorners(points)
 {
 	// Find the bounding box of the terrain feature
-	var mapSize = getMapSize();
+	var mapSize = g_Map.getSize();
 	var minX = mapSize + 1;
 	var minZ = mapSize + 1;
 	var maxX = -1;
@@ -1187,7 +1187,7 @@ function paintHeightmap(mapName, func = undefined)
 	 */
 	let mapData = Engine.ReadJSONFile("maps/random/" + mapName + ".hmap");
 
-	let mapSize = getMapSize(); // Width of the map in terrain tiles
+	let mapSize = g_Map.getSize(); // Width of the map in terrain tiles
 	let hmSize = Math.sqrt(mapData.heightmap.length);
 	let scale = hmSize / (mapSize + 1); // There are mapSize + 1 vertices (each 1 tile is surrounded by 2x2 vertices)
 

binaries/data/mods/public/maps/random/rmgen2/setup.js

@@ -153,7 +153,7 @@ function createBase(player, walls = true)
 		"playerPosition": player.position,
 		"PlayerTileClass": g_TileClasses.player,
 		"BaseResourceClass": g_TileClasses.baseResource,
-		"Walls": getMapSize() > 192 && walls,
+		"Walls": g_Map.getSize() > 192 && walls,
 		"CityPatch": {
 			"outerTerrain": g_Terrains.roadWild,
 			"innerTerrain": g_Terrains.road,
@@ -220,7 +220,7 @@ function getTeamsArray()
 function randomStartingPositionPattern(teamsArray)
 {
 	var formats = ["radial"];
-	var mapSize = getMapSize();
+	var mapSize = g_Map.getSize();
 	var numPlayers = getNumPlayers();
 
 	// Enable stronghold if we have a few teams and a big enough map

binaries/data/mods/public/maps/random/saharan_oases.js

@@ -39,7 +39,7 @@ const heightOffsetOasis = -3;
 var g_Map = new RandomMap(heightLand, tPrimary);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/sahel.js

@@ -33,7 +33,7 @@ const heightLand = 1;
 var g_Map = new RandomMap(heightLand, tPrimary);
 
 var numPlayers = getNumPlayers();
-var mapSize = getMapSize();
+var mapSize = g_Map.getSize();
 
 var clPlayer = createTileClass();
 var clForest = createTileClass();

binaries/data/mods/public/maps/random/sahel_watering_holes.js

@@ -44,7 +44,7 @@ const heightOffsetBump = 2;
 var g_Map = new RandomMap(heightLand, tGrass);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/schwarzwald.js

@@ -78,7 +78,7 @@ var clFood = createTileClass();
 var clBaseResource = createTileClass();
 var clOpen = createTileClass();
 
-var mapSize = getMapSize();
+var mapSize = g_Map.getSize();
 var mapCenter = g_Map.getCenter();
 var mapRadius = mapSize/2;
 

binaries/data/mods/public/maps/random/snowflake_searocks.js

@@ -44,7 +44,7 @@ const heightSeaGround = -5;
 var g_Map = new RandomMap(heightSeaGround, tWater);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/survivalofthefittest.js

@@ -45,7 +45,7 @@ const heightHill = 30;
 var g_Map = new RandomMap(heightHill, tMainTerrain);
 
 var numPlayers = getNumPlayers();
-var mapSize = getMapSize();
+var mapSize = g_Map.getSize();
 var mapCenter = g_Map.getCenter();
 
 var clPlayer = createTileClass();

binaries/data/mods/public/maps/random/the_nile.js

@@ -47,7 +47,7 @@ const heightOffsetBump = 2;
 
 var g_Map = new RandomMap(heightLand, tPrimary);
 
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 const mapBounds = g_Map.getBounds();
 

binaries/data/mods/public/maps/random/the_unknown/unknown_common.js

@@ -59,7 +59,7 @@ const heightOffsetBump = 2;
 var g_Map = new RandomMap(heightSeaGround, tWater);
 
 const numPlayers = getNumPlayers();
-const mapSize = getMapSize();
+const mapSize = g_Map.getSize();
 const mapCenter = g_Map.getCenter();
 const mapBounds = g_Map.getBounds();
 

binaries/data/mods/public/maps/random/wall_demo.js

@@ -42,7 +42,7 @@ var g_Map = new RandomMap(0, "grass1");
  * And have fun!
  */
 
-var mapSize = getMapSize();
+var mapSize = g_Map.getSize();
 
 /**
  * General wall placement setup