Implement dependency injection for game classes #13

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / GameItems.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index 8c3720d42927dffb5da03e7c95c677447f031f61..f210baabf9abcb5658882331a00ea8842e6727bf 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
@@ -86,15 +86,11 @@ public class GameItems {
     }
 
     public static Sprite getBlockTex(int id) {
-        return getBlock(id).getTex();
+        return getBlock(id).getTexture();
     }
 
     public static Sprite getItemTex(int id) {
-        if (items.getValueAt(id).getType().equals("block")) {
-            return getBlockTex(id);
-        } else {
-            return getItem(id).getTex();
-        }
+        return items.getValueAt(id).getType().equals("block") ? getBlockTex(id) : getItem(id).getTexture();
     }
 
     public static void load() {