diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Drop.java b/core/src/ru/deadsoftware/cavecraft/game/objects/Drop.java
index 5ff36e476584f6eaa9ac34733d76ba550df0d9ea..fa60f6b60d67f9eec9385988f66da77537c7eed2 100644 (file)
public class Drop implements Serializable {
private int id;
- public Vector2 move, position;
-
- public static void pickUpDrop(Player pl, int id) {
- for (int i = 0; i < pl.inventory.length; i++) {
- if (pl.inventory[i] == 0) {
- pl.inventory[i] = id;
- break;
- }
- }
- }
+ public boolean pickedUp = false;
+ public Vector2 move, pos;
public Drop(float x, float y, int id) {
this.id = id;
- position = new Vector2(x, y);
+ pos = new Vector2(x, y);
move = new Vector2(0, -1);
}
+ public void pickUpDrop(Player pl) {
+ for (int i = 0; i < pl.inv.length; i++) {
+ if (pl.inv[i] == 0 || pl.inv[i] == id) {
+ pl.inv[i] = id;
+ pickedUp = true;
+ break;
+ }
+ }
+ }
+
public int getId() {
return id;
}
public Rectangle getRect() {
- return new Rectangle(position.x, position.y, 8, 8);
+ return new Rectangle(pos.x, pos.y, 8, 8);
}
}