lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #1484 from thecodingmachine/fixExitUrl

Browse source 
FIX: initPositionFromLayerName will now prioritize its target layer rather than the start layer
This commit is contained in:
Kharhamel 2021-09-24 12:00:23 +02:00 committed by GitHub
parent d033b78c58 ce26294250
commit 8d1943d6e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
front/src/Phaser/Game/StartPositionCalculator.ts
View file

@ -51,19 +51,25 @@ export class StartPositionCalculator {
if (!selectedOrDefaultLayer) {
selectedOrDefaultLayer = defaultStartLayerName;
}
let foundLayer: ITiledMapLayer | null = null;
for (const layer of this.gameMap.flatLayers) {
if (
(selectedOrDefaultLayer === layer.name || layer.name.endsWith("/" + selectedOrDefaultLayer)) &&
layer.type === "tilelayer" &&
(selectedOrDefaultLayer === defaultStartLayerName || this.isStartLayer(layer))
) {
const startPosition = this.startUser(layer, selectedLayer);
this.startPosition = {
x: startPosition.x + this.mapFile.tilewidth / 2,
y: startPosition.y + this.mapFile.tileheight / 2,
};
if (layer.type !== "tilelayer") continue;
//we want to prioritize the selectedLayer other the start layer
if (selectedOrDefaultLayer === layer.name || layer.name.endsWith("/" + selectedOrDefaultLayer)) {
foundLayer = layer;
break;
} else if (selectedOrDefaultLayer === defaultStartLayerName || this.isStartLayer(layer)) {
foundLayer = layer;
break;
}
}
if (foundLayer) {
const startPosition = this.startUser(foundLayer, selectedLayer);
this.startPosition = {
x: startPosition.x + this.mapFile.tilewidth / 2,
y: startPosition.y + this.mapFile.tileheight / 2,
};
}
}
private isStartLayer(layer: ITiledMapLayer): boolean {