backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-22 03:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:yldrefruz/Fantasy-Map-Generator into gzip-map

Browse source
This commit is contained in:
Efruz Yıldırır 2023-08-14 15:51:53 +03:00
commit 25a1120245
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/dynamic/auto-update.js
View file

@ -639,7 +639,9 @@ export function resolveVersionConflicts(version) {
if (version < 1.91) { if (version < 1.91) {
// from v1.90.02 texture image is always there // from v1.90.02 texture image is always there
if (!texture.selectAll("*").size()) { if (!texture.select("#textureImage").size()) {
// cleanup old texture if it has no id and add new one
texture.selectAll("*").remove();
texture texture
.append("image") .append("image")
.attr("id", "textureImage") .attr("id", "textureImage")
@ -706,7 +708,7 @@ export function resolveVersionConflicts(version) {
// leftover from v1.90.02 // leftover from v1.90.02
texture.style("display", null); texture.style("display", null);
const textureImage = texture.select("#textureImage"); const textureImage = texture.select("#textureImage");
if (textureImage) { if (textureImage.size()) {
const xlink = textureImage.attr("xlink:href"); const xlink = textureImage.attr("xlink:href");
const href = textureImage.attr("href"); const href = textureImage.attr("href");
const src = xlink || href; const src = xlink || href;

2
modules/io/load.js
View file

@ -452,7 +452,7 @@ async function parseLoadedData(data) {
{ {
// dynamically import and run auto-udpdate script // dynamically import and run auto-udpdate script
const versionNumber = parseFloat(params[0]); const versionNumber = parseFloat(params[0]);
const { resolveVersionConflicts } = await import("../dynamic/auto-update.js?v=1.92.02"); const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=1.92.04");
resolveVersionConflicts(versionNumber); resolveVersionConflicts(versionNumber);
} }