X-Git-Url: http://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2Fobjects%2FDrop.java;h=e967f880314480a1fd9b9d73c77aedea4729622f;hp=5ff36e476584f6eaa9ac34733d76ba550df0d9ea;hb=3fb849898964a43a51cc6483ac72f5e3abbd01f0;hpb=0b8922bfbb2bbec067b532ecb7912f6afe02c4ef

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