X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2Fobjects%2FBlock.java;h=44619f0654f3c9e2a22adbee85e66e28037962ba;hb=75e8bbe4c9dceaabd8bb7e7976ad9052cfb0a968;hp=a1696f64b340a7c3ed979cf3c3e5b359362dfb0e;hpb=40312aaac2ec8bd1247ad5979f7bd1d8e47ecae3;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java b/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
index a1696f6..44619f0 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
@@ -6,25 +6,30 @@ import com.badlogic.gdx.math.Rectangle;
 public class Block {
 
     private int x,y,w,h;
-    private TextureRegion texture;
+    private int texture;
 
-    public boolean collision, foreground;
+    public boolean collision, background, transparent;
 
-    public Block(int x, int y, int w, int h, TextureRegion texture) {
-        this(x,y,w,h,texture, true, false);
+    public Block(int texture) {
+        this(0,0,16,16,texture, true, false, false);
     }
 
-    public Block(int x, int y, int w, int h, TextureRegion texture, boolean collision, boolean foreground) {
+    public Block(int texture, boolean collision, boolean background, boolean transparent) {
+        this(0,0,16,16,texture, collision, background, transparent);
+    }
+
+    public Block(int x, int y, int w, int h, int texture, boolean collision, boolean background, boolean transparent) {
         this.x = x;
         this.y = y;
         this.w = w;
         this.h = h;
         this.texture = texture;
         this.collision = collision;
-        this.foreground = foreground;
+        this.background = background;
+        this.transparent = transparent;
     }
 
-    public TextureRegion getTexture() {
+    public int getTexture() {
         return texture;
     }
 
@@ -34,4 +39,8 @@ public class Block {
         return new Rectangle(x+this.x, y+this.y, w, h);
     }
 
+    public boolean toJump() {
+        return (y<8 && collision);
+    }
+
 }