phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix wrong default in "scaleByMapArea"

Browse Source 
Noticed and patch proposed by @Feldfeld in 480228f964
Doesn't have any consequences as the function is only called via
"scaleByMapAreaAbsolute" in the codebase.

accepted by @Feldfeld @marder

Differential revision: https://code.wildfiregames.com/D5248
This was SVN commit r28042.
This commit is contained in:
marder 2024-02-28 06:44:09 +00:00
parent 1eb11b39bf
commit 1b3e8a0218
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binaries/data/mods/public/maps/random/rmgen/library.js
View File

@ -84,7 +84,7 @@ function scaleByMapSize(min, max, minMapSize = 128, maxMapSize = 512)
* Interpolate quadratic between (min, minMapArea) and (max, maxMapArea) with respect to the mapSize.
* Default values set on the area of tiny and giant map sizes according to the map shape (square or circular).
*/
function scaleByMapArea(min, max, minMapArea = g_Map.getArea(128), maxMapArea = g_Map.getArea(256))
function scaleByMapArea(min, max, minMapArea = g_Map.getArea(128), maxMapArea = g_Map.getArea(512))
{
return min + (max - min) * (g_Map.getArea() - minMapArea) / (maxMapArea - minMapArea);
}
@ -165,7 +165,7 @@ function createAreasInAreas(centeredPlacer, painter, constraints, amount, retryF
log("createAreasInAreas: 'areas' was either empty or only contained empty areas thus returning an empty array.\n" + new Error().stack);
return [];
}
const placeFunc = function() {
centeredPlacer.setCenterPosition(pickRandom(pickRandom(areas).getPoints()));
return createArea(centeredPlacer, painter, constraints);
@ -199,7 +199,7 @@ function createObjectGroupsByAreas(group, player, constraints, amount, retryFact
log("createObjectGroupsByAreas: 'areas' was either empty or only contained empty areas.\n" + new Error().stack);
return [];
}
const placeFunc = function() {
group.setCenterPosition(pickRandom(pickRandom(areas).getPoints()));
return createObjectGroup(group, player, constraints);