gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Remove 23 copies of the random mapgen terrain init loop (including 16 copies of unused x and z vars).

Browse Source 
This was SVN commit r20146.
This commit is contained in:
elexis
2017-09-09 15:30:44 +00:00
parent 4d22667ac9
commit 45bb3d2a43
23 changed files with 28 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/maps/random/african_plains.js
+1 -8
View File
@@ -54,14 +54,7 @@ var clMetal = createTileClass();
var clFood = createTileClass();
var clBaseResource = createTileClass();
// Cover the ground with the primary terrain chosen in the beginning
for (var ix = 0; ix < mapSize; ++ix)
for (var iz = 0; iz < mapSize; ++iz)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tPrimary);
}
initTerrain(tPrimary);
// Randomize player order
var playerIDs = [];
binaries/data/mods/public/maps/random/alpine_lakes.js
+1 -10
View File
@@ -100,16 +100,7 @@ var clFood = createTileClass();
var clBaseResource = createTileClass();
var clSettlement = createTileClass();
//cover the ground with the primary terrain chosen in the beginning
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tPrimary);
}
}
initTerrain(tPrimary);
// randomize player order
var playerIDs = [];
binaries/data/mods/public/maps/random/alpine_valley.js
+1 -8
View File
@@ -85,14 +85,7 @@ var clFood = createTileClass();
var clBaseResource = createTileClass();
var clSettlement = createTileClass();
//cover the ground with the primary terrain chosen in the beginning
for (var ix = 0; ix < mapSize; ix++)
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tPrimary);
}
initTerrain(tPrimary);
// randomize player order
var playerIDs = [];
binaries/data/mods/public/maps/random/arctic_summer.js
+1 -4
View File
@@ -54,10 +54,7 @@ var clMetal = createTileClass();
var clFood = createTileClass();
var clBaseResource = createTileClass();
// Cover the ground with the primary terrain chosen in the beginning
for (let ix = 0; ix < mapSize; ++ix)
for (let iz = 0; iz < mapSize; ++iz)
placeTerrain(ix, iz, tPrimary);
initTerrain(tPrimary);
// Randomize player order
var playerIDs = [];
binaries/data/mods/public/maps/random/canyon.js
+1 -9
View File
@@ -65,15 +65,7 @@ var clBaseResource = createTileClass();
var clSettlement = createTileClass();
var clLand = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tMainTerrain);
}
}
initTerrain(tMainTerrain);
var fx = fractionToTiles(0.5);
var fz = fractionToTiles(0.5);
binaries/data/mods/public/maps/random/continent.js
+1 -9
View File
@@ -61,15 +61,7 @@ var clBaseResource = createTileClass();
var clSettlement = createTileClass();
var clLand = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tWater);
}
}
initTerrain(tWater);
var fx = fractionToTiles(0.5);
var fz = fractionToTiles(0.5);
binaries/data/mods/public/maps/random/corsica.js
+1 -11
View File
@@ -88,17 +88,7 @@ var clFood = createTileClass();
var clSettlement = createTileClass();
var clDune = createTileClass();
// on every pixel of the map, set wet sand
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tVeryDeepWater);
//addToClass(ix,iz,clWater);
}
}
initTerrain(tVeryDeepWater);
var swap = randBool();
binaries/data/mods/public/maps/random/flood.js
+1 -3
View File
@@ -69,9 +69,7 @@ let clMetal = createTileClass();
let clFood = createTileClass();
let clBaseResource = createTileClass();
for (let ix = 0; ix < mapSize; ++ix)
for (let iz = 0; iz < mapSize; ++iz)
placeTerrain(ix, iz, tWater);
initTerrain(tWater);
// Randomize player order
let playerIDs = [];
binaries/data/mods/public/maps/random/gear.js
+1 -3
View File
@@ -66,9 +66,7 @@ var clBaseResource = createTileClass();
var clSettlement = createTileClass();
var clLand = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
for (var iz = 0; iz < mapSize; iz++)
placeTerrain(ix, iz, tMainTerrain);
initTerrain(tMainTerrain);
var fx = fractionToTiles(0.5);
var fz = fractionToTiles(0.5);
binaries/data/mods/public/maps/random/gulf_of_bothnia.js
+1 -9
View File
@@ -136,15 +136,7 @@ var clFood = createTileClass();
var clBaseResource = createTileClass();
var clSettlement = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tPrimary);
}
}
initTerrain(tPrimary);
// randomize player order
var playerIDs = [];
binaries/data/mods/public/maps/random/island_stronghold.js
+1 -3
View File
@@ -73,9 +73,7 @@ let clFood = createTileClass();
let clBaseResource = createTileClass();
let clLand = createTileClass();
for (let ix = 0; ix < mapSize; ++ix)
for (let iz = 0; iz < mapSize; ++iz)
placeTerrain(ix, iz, tWater);
initTerrain(tWater);
// some constants
let radius = scaleByMapSize(15, 25);
binaries/data/mods/public/maps/random/lake.js
+1 -9
View File
@@ -61,15 +61,7 @@ var clFood = createTileClass();
var clBaseResource = createTileClass();
var clSettlement = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tMainTerrain);
}
}
initTerrain(tMainTerrain);
// randomize player order
var playerIDs = [];
binaries/data/mods/public/maps/random/mainland.js
+1 -9
View File
@@ -60,15 +60,7 @@ var clFood = createTileClass();
var clBaseResource = createTileClass();
var clSettlement = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tMainTerrain);
}
}
initTerrain(tMainTerrain);
// randomize player order
var playerIDs = [];
binaries/data/mods/public/maps/random/oasis.js
+1 -9
View File
@@ -54,15 +54,7 @@ var clBaseResource = createTileClass();
var clSettlement = createTileClass();
var clDune = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tSand);
}
}
initTerrain(tSand);
// randomize player order
var playerIDs = [];
binaries/data/mods/public/maps/random/persian_highlands.js
+1 -9
View File
@@ -69,15 +69,7 @@ var clFood = createTileClass();
var clBaseResource = createTileClass();
var clCP = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tDirtMain);
}
}
initTerrain(tDirtMain);
var playerIDs = [];
for (var i = 0; i < numPlayers; i++)
binaries/data/mods/public/maps/random/polar_sea.js
+1 -3
View File
@@ -45,9 +45,7 @@ var clWolf = createTileClass();
// Expected by rmgen1
var clForest = createTileClass();
for (let ix = 0; ix < mapSize; ++ix)
for (let iz = 0; iz < mapSize; ++iz)
placeTerrain(ix, iz, tPrimary);
initTerrain(tPrimary);
var playerIDs = [];
for (let i = 0; i < numPlayers; ++i)
binaries/data/mods/public/maps/random/rivers.js
+2 -9
View File
@@ -65,15 +65,8 @@ var clFood = createTileClass();
var clBaseResource = createTileClass();
var clSettlement = createTileClass();
var clShallow = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tMainTerrain);
}
}
initTerrain(tMainTerrain);
var fx = fractionToTiles(0.5);
var fz = fractionToTiles(0.5);
binaries/data/mods/public/maps/random/rmgen/library.js
+5
View File
@@ -290,6 +290,11 @@ function placeTerrain(x, z, terrain)
g_Map.placeTerrain(x, z, createTerrain(terrain));
}
function initTerrain(tileClass)
{
g_Map.initTerrain(createTerrain(tileClass));
}
function isCircularMap()
{
return !!g_MapSettings.CircularMap;
binaries/data/mods/public/maps/random/snowflake_searocks.js
+1 -11
View File
@@ -63,17 +63,7 @@ var clBaseResource = createTileClass();
var clSettlement = createTileClass();
var clLand = createTileClass();
//Paint the whole map
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tWater);
}
}
initTerrain(tWater);
const radius = scaleByMapSize(15,30);
const cliffRadius = 2;
binaries/data/mods/public/maps/random/survivalofthefittest.js
+1 -3
View File
@@ -54,9 +54,7 @@ var clBaseResource = createTileClass();
var clLand = createTileClass();
var clWomen = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
for (var iz = 0; iz < mapSize; iz++)
placeTerrain(ix, iz, tMainTerrain);
initTerrain(tMainTerrain);
var ix = Math.round(fractionToTiles(0.5));
var iz = Math.round(fractionToTiles(0.5));
binaries/data/mods/public/maps/random/unknown.js
+1 -9
View File
@@ -66,15 +66,7 @@ var clSettlement = createTileClass();
var clLand = createTileClass();
var clShallow = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tWater);
}
}
initTerrain(tWater);
var iberianTowers = false;
var md = randIntInclusive(1,13);
binaries/data/mods/public/maps/random/unknown_land.js
+1 -9
View File
@@ -66,15 +66,7 @@ var clSettlement = createTileClass();
var clLand = createTileClass();
var clShallow = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tWater);
}
}
initTerrain(tWater);
var md = randIntInclusive(2,13);
var needsAdditionalWood = false;
binaries/data/mods/public/maps/random/unknown_nomad.js
+1 -9
View File
@@ -66,15 +66,7 @@ var clSettlement = createTileClass();
var clLand = createTileClass();
var clShallow = createTileClass();
for (var ix = 0; ix < mapSize; ix++)
{
for (var iz = 0; iz < mapSize; iz++)
{
var x = ix / (mapSize + 1.0);
var z = iz / (mapSize + 1.0);
placeTerrain(ix, iz, tWater);
}
}
initTerrain(tWater);
var startAngle = randFloat(0, TWO_PI);
var md = randIntInclusive(1,13);