From 26aa784e090499da39fac285b4716ba3137df789 Mon Sep 17 00:00:00 2001
From: zalavari <zalavari@sch.bme.hu>
Date: Tue, 1 May 2018 12:03:32 +0200
Subject: [PATCH] =?UTF-8?q?A=20drawWorker=20mostant=C3=B3l=20v=C3=A1r=20eg?=
=?UTF-8?q?y=20workert=20param=C3=A9terk=C3=A9nt,=20=C3=A9s=20k=C3=BCl?=
=?UTF-8?q?=C3=B6nb=C3=B6z=C5=91=20munk=C3=A1sok=20jelennek=20meg.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/killer_sokoban/View.java | 13 +++++--------
src/killer_sokoban/Worker.java | 2 +-
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/killer_sokoban/View.java b/src/killer_sokoban/View.java
index cea8c00..26061d1 100644
--- a/src/killer_sokoban/View.java
+++ b/src/killer_sokoban/View.java
@@ -19,8 +19,6 @@ public class View {
private Image honeyImg=new Image("file:GIMPimages/Honey.png");
private Image oilImg=new Image("file:GIMPimages/Oil.png");
private Image crateImg=new Image("file:GIMPimages/Crate.png");
- private Image w1Img=new Image("file:GIMPimages/w1.png");
- private Image w2Img=new Image("file:GIMPimages/w2.png");
private Image holeImg=new Image("file:GIMPimages/Hole.png");
private Image simpleFieldImg=new Image("file:GIMPimages/SimpleField.png");
private Image switchFieldImg=new Image("file:GIMPimages/SwitchField.png");
@@ -41,6 +39,7 @@ public class View {
public void update()
{
//gc.clearRect(0, 0, column*tileSize, line*tileSize);
+ //Pálya kifestése a simplefield mező színével.
gc.setFill(Color.rgb(92, 92, 92));
gc.fillRect(0, 0, column*tileSize, line*tileSize);
for (x=0;x<column;x++)
@@ -67,10 +66,6 @@ public class View {
gc.setFill(Color.BLACK);
gc.drawImage(holeImg, x*tileSize, y*tileSize);
}
- public void drawSwitchableHole() {
- gc.setFill(Color.PINK);
- gc.fillRect(x*tileSize, y*tileSize, tileSize, tileSize);
- }
public void drawSwitchField() {
gc.setFill(Color.PLUM);
gc.drawImage(switchFieldImg, x*tileSize, y*tileSize);
@@ -88,9 +83,11 @@ public class View {
gc.drawImage(honeyImg, x*tileSize, y*tileSize);
}
- public void drawWorker() {
+ public void drawWorker(Worker w) {
+ String name=Main.getMoveableName(w);
+ Image wImg=new Image("file:GIMPimages/"+name+".png");
gc.setFill(Color.GREEN);
- gc.drawImage(w1Img, x*tileSize, y*tileSize);
+ gc.drawImage(wImg, x*tileSize, y*tileSize);
}
public void drawCrate() {
gc.setFill(Color.ORANGE);
diff --git a/src/killer_sokoban/Worker.java b/src/killer_sokoban/Worker.java
index f3c2dbf..d0ebb1d 100644
--- a/src/killer_sokoban/Worker.java
+++ b/src/killer_sokoban/Worker.java
@@ -114,7 +114,7 @@ public class Worker extends Moveable {
public void shouldDraw(View view)
{
super.shouldDraw(view);
- view.drawWorker();
+ view.drawWorker(this);
}
}
--
GitLab