From 17ffb0e6aae03828f8fb6a104ec31ca84dec0303 Mon Sep 17 00:00:00 2001
From: zalavari <zalavari@sch.bme.hu>
Date: Mon, 30 Apr 2018 09:34:01 +0200
Subject: [PATCH] SwitchableHole looks like simplefield or hole, based on its
state
---
src/killer_sokoban/SwitchableHole.java | 10 ++++++----
src/killer_sokoban/View.java | 4 +---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/killer_sokoban/SwitchableHole.java b/src/killer_sokoban/SwitchableHole.java
index 347914a..3df89be 100644
--- a/src/killer_sokoban/SwitchableHole.java
+++ b/src/killer_sokoban/SwitchableHole.java
@@ -20,8 +20,8 @@ public class SwitchableHole extends SimpleField {
ret=super.accept(toward, w, m);
}
- //this seems like an else branch, but its not
//the hole could open while super.accept was being called
+ //so it can't be an else branch
if (opened)
{
m.move(this);
@@ -38,11 +38,9 @@ public class SwitchableHole extends SimpleField {
*/
public void open()
{
-
if (myMoveable!=null)
myMoveable.kill();
opened=true;
-
}
/**
@@ -62,7 +60,11 @@ public class SwitchableHole extends SimpleField {
@Override
public void shouldDraw(View view)
{
- view.drawSwitchableHole();
+ //Ha nyitva van, rajzolunk egy lyukat is
+ if (opened)
+ view.drawHole();
+
+ //Akár nyitva van, akár nem, kirajajzoljuk a többit is.
super.shouldDraw(view);
}
diff --git a/src/killer_sokoban/View.java b/src/killer_sokoban/View.java
index 1f5ce8d..3ec5094 100644
--- a/src/killer_sokoban/View.java
+++ b/src/killer_sokoban/View.java
@@ -34,14 +34,12 @@ public class View {
}
public void drawAbstract() {
- gc.setLineWidth(2);
+ gc.setLineWidth(1);
gc.setStroke(Color.BLUE);
gc.strokeRect(x*tileSize, y*tileSize, tileSize, tileSize);
}
public void drawSimpleField() {
- gc.setFill(Color.ALICEBLUE);
- //gc.fillRect(x*tileSize, y*tileSize, tileSize, tileSize);
}
public void drawTargetField() {
--
GitLab