diff --git a/HeatUp/src/de/heatup/objects/ImageLoader.java b/HeatUp/src/de/heatup/objects/ImageLoader.java index b63576d..730b13d 100644 --- a/HeatUp/src/de/heatup/objects/ImageLoader.java +++ b/HeatUp/src/de/heatup/objects/ImageLoader.java @@ -27,16 +27,16 @@ public class ImageLoader { imageFileName="src/de/heatup/resources/images/25x25_wall_orange_2.png"; break; case 'u': - imageFileName="src/de/heatup/resources/images/little_green_guy_up.png"; + imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; break; case 'd': - imageFileName="src/de/heatup/resources/images/little_green_guy.png"; + imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; break; case 'l': - imageFileName="src/de/heatup/resources/images/little_green_guy_left.png"; + imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; break; case 'r': - imageFileName="src/de/heatup/resources/images/little_green_guy_right.png"; + imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; break; default: imageFileName="src/de/heatup/resources/images/dummy_image.png"; diff --git a/HeatUp/src/de/heatup/objects/StaticObject.java b/HeatUp/src/de/heatup/objects/StaticObject.java index af63843..496f76c 100644 --- a/HeatUp/src/de/heatup/objects/StaticObject.java +++ b/HeatUp/src/de/heatup/objects/StaticObject.java @@ -90,17 +90,7 @@ public class StaticObject extends JComponent { } -// public void setRescale(double rescaleFactorX, double rescaleFactorY) { -// this.rescaleFactorX = rescaleFactorX; -// this.rescaleFactorY = rescaleFactorY; -// this.doRescale = true; -// } - -// public void unsetRescale() { -// this.rescaleFactorX = 0.0; -// this.rescaleFactorY = 0.0; -// this.doRescale = false; -// } + // TODO: getter für höhe breite position public void setAutoBounds(int x, int y) { this.setBounds(x, y, this.bf1.getWidth(), this.bf1.getHeight()); diff --git a/HeatUp/src/de/heatup/objects/logic.java b/HeatUp/src/de/heatup/objects/logic.java index 66921cf..a9e2a04 100644 --- a/HeatUp/src/de/heatup/objects/logic.java +++ b/HeatUp/src/de/heatup/objects/logic.java @@ -84,7 +84,7 @@ public class logic { //System.out.println("x: " + dynObj.getX() + " y: " + dynObj.getY()); //System.out.println("h: " + dynObj.getHeight() + " w: " + dynObj.getWidth()); try { - Thread.sleep(10); + Thread.sleep(40); } catch (InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/HeatUp/src/de/heatup/resources/images/little_green_guy_verysmall.png b/HeatUp/src/de/heatup/resources/images/little_green_guy_verysmall.png new file mode 100644 index 0000000..19ad9fe Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/little_green_guy_verysmall.png differ