X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2Fobjects%2FBlock.java;h=8d27235a4fc941f87309855bf6c85e6e09538ed9;hb=8c0966b107ebbf261f8aa9c516fb90b0d9d230e5;hp=4fa47369fd151f2760ea314e58e9eadb2009ec43;hpb=4617ae53584520a741f45770e17a2a253717f83a;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 4fa4736..8d27235 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
@@ -1,42 +1,65 @@
 package ru.deadsoftware.cavecraft.game.objects;
 
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.math.Rectangle;
 
 public class Block {
 
-    private int x,y,w,h;
-    private int texture;
+    private int x, y, w, h;
+    private int tex;
+    private int hp, drop;
 
-    public boolean collision, background, transparent;
+    public boolean coll, bg, tp, rb;
 
-    public Block(int texture) {
-        this(0,0,16,16,texture, true, false, false);
+    public Block(int tex, int hp, int drop) {
+        this(0, 0, 16, 16, tex, hp, drop, true, false, false, false);
     }
 
-    public Block(int texture, boolean collision, boolean background, boolean transparent) {
-        this(0,0,16,16,texture, collision, background, transparent);
+    public Block(int tex, int hp, int drop, boolean coll, boolean bg, boolean tp) {
+        this(0, 0, 16, 16, tex, hp, drop, coll, bg, tp, false);
     }
 
-    public Block(int x, int y, int w, int h, int texture, boolean collision, boolean background, boolean transparent) {
+    public Block(int tex, int hp, int drop, boolean coll, boolean bg, boolean tp, boolean rb) {
+        this(0, 0, 16, 16, tex, hp, drop, coll, bg, tp, rb);
+    }
+
+    public Block(int x, int y, int w, int h, int tex, int hp, int drop, boolean coll, boolean bg, boolean tp) {
+        this(x, y, w, h, tex, hp, drop, coll, bg, tp, false);
+    }
+
+    public Block(int x, int y, int w, int h, int tex, int hp, int drop, boolean coll, boolean bg, boolean tp, boolean rb) {
         this.x = x;
         this.y = y;
         this.w = w;
         this.h = h;
-        this.texture = texture;
-        this.collision = collision;
-        this.background = background;
-        this.transparent = transparent;
+        this.tex = tex;
+        this.hp = hp;
+        this.drop = drop;
+        this.coll = coll;
+        this.bg = bg;
+        this.tp = tp;
+        this.rb = rb;
+    }
+
+    public int getTex() {
+        return tex;
+    }
+
+    public int getHp() {
+        return hp;
     }
 
-    public int getTexture() {
-        return texture;
+    public int getDrop() {
+        return drop;
     }
 
     public Rectangle getRect(int x, int y) {
-        x*=16;
-        y*=16;
-        return new Rectangle(x+this.x, y+this.y, w, h);
+        x *= 16;
+        y *= 16;
+        return new Rectangle(x + this.x, y + this.y, w, h);
+    }
+
+    public boolean toJump() {
+        return (y < 8 && coll);
     }
 
 }