From 22b177ca57c26b263c6523c725b621b4e82c7f34 Mon Sep 17 00:00:00 2001 From: musilto9 Date: Thu, 16 Apr 2020 11:36:00 +0200 Subject: [PATCH] improved cameraFree --- src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java | 2 ++ src/main/java/ruscz/game/gameOfProd/Cells/Person.java | 1 + 2 files changed, 3 insertions(+) diff --git a/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java b/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java index ea0538f..cf74930 100644 --- a/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java +++ b/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java @@ -50,6 +50,7 @@ public class InteractionCell extends Cell { public void readNextLine() { if (scanner.hasNextLine() && !dialog.getTimerIsRunning()) { String data = scanner.nextLine(); + window.getCamera().setCameraFirstMove(false); if (data.equals("")) { endEvent(); } @@ -70,6 +71,7 @@ public class InteractionCell extends Cell { readNextLine(); } else if (data.contains("")) { + window.getCamera().setCameraFirstMove(true); return; } else if (data.contains("")) { diff --git a/src/main/java/ruscz/game/gameOfProd/Cells/Person.java b/src/main/java/ruscz/game/gameOfProd/Cells/Person.java index 490281e..e600fd4 100644 --- a/src/main/java/ruscz/game/gameOfProd/Cells/Person.java +++ b/src/main/java/ruscz/game/gameOfProd/Cells/Person.java @@ -94,6 +94,7 @@ public class Person extends Cell { } else if (map.isActiveTriggerCell(x,y) && isInEvent) { map.findTriggerByXY(x,y).readNextLine(); + } else if (isDoorInFront(x,y,directionSight)) { DoorCell door = map.findDoorByXY(x, y, directionSight);