felix/workadventure
1
0
Fork 0
Code Pull Requests Releases Activity

fixed merge conflict

Browse Source
This commit is contained in:
jonny 2021-06-25 18:20:16 +02:00
parent 7f61e9addd
commit bbdf0a1289
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
front/src/Phaser/Game/GameScene.ts
View File

@ -79,7 +79,6 @@ import { TextUtils } from "../Components/TextUtils";
import { touchScreenManager } from "../../Touch/TouchScreenManager"; import { touchScreenManager } from "../../Touch/TouchScreenManager";
import { PinchManager } from "../UserInput/PinchManager"; import { PinchManager } from "../UserInput/PinchManager";
import { joystickBaseImg, joystickBaseKey, joystickThumbImg, joystickThumbKey } from "../Components/MobileJoystick"; import { joystickBaseImg, joystickBaseKey, joystickThumbImg, joystickThumbKey } from "../Components/MobileJoystick";
import { DEPTH_OVERLAY_INDEX } from "./DepthIndexes";
import { waScaleManager } from "../Services/WaScaleManager"; import { waScaleManager } from "../Services/WaScaleManager";
import { EmoteManager } from "./EmoteManager"; import { EmoteManager } from "./EmoteManager";

2
front/src/Phaser/Game/StartPositionCalculator.ts
View File

@ -51,7 +51,7 @@ export class StartPositionCalculator {
if (!selectedOrDefaultLayer) { if (!selectedOrDefaultLayer) {
selectedOrDefaultLayer = defaultStartLayerName; selectedOrDefaultLayer = defaultStartLayerName;
} }
for (const layer of this.gameMap.layersIterator) { for (const layer of this.gameMap.flatLayers) {
if ( if (
(selectedOrDefaultLayer === layer.name || layer.name.endsWith("/" + selectedOrDefaultLayer)) && (selectedOrDefaultLayer === layer.name || layer.name.endsWith("/" + selectedOrDefaultLayer)) &&
layer.type === "tilelayer" && layer.type === "tilelayer" &&