X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameWorld.java;h=4a14c7123f7935203a6206f9ff5559475a20e862;hb=597ab66d10b43233da31893d0d074485d5aa0bd2;hp=92973e18192e64de711c2408af2abe0af075c0b2;hpb=6ab2a53526f16de139d39a59c3d800e5f3013c68;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 92973e1..4a14c71 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -2,12 +2,10 @@ package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavecraft.Items;
 
 public class GameWorld {
 
     private int WIDTH, HEIGHT;
-
     private int[][] foreMap;
     private int[][] backMap;
 
@@ -27,11 +25,16 @@ public class GameWorld {
         return backMap;
     }
 
+    private int transformX(int x) {
+        x = x%getWidth();
+        if (x<0) x=getWidth()-Math.abs(x);
+        return x;
+    }
+
     public int getForeMap(int x, int y) {
         int map = 0;
         try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
+            x = transformX(x);
             map = foreMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld",e.toString());
@@ -41,8 +44,7 @@ public class GameWorld {
 
     public void setForeMap(int x, int y, int value) {
         try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
+            x = transformX(x);
             foreMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld", e.toString());
@@ -52,8 +54,7 @@ public class GameWorld {
     public int getBackMap(int x, int y) {
         int map = 0;
         try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
+            x = transformX(x);
             map = backMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld",e.toString());
@@ -63,8 +64,7 @@ public class GameWorld {
 
     public void setBackMap(int x, int y, int value) {
         try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
+            x = transformX(x);
             backMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld", e.toString());
@@ -73,12 +73,12 @@ public class GameWorld {
 
     public void placeToForeground(int x, int y, int value) {
         if (getForeMap(x,y) == 0 || value == 0) {
-            setForeMap(x,y,value);
+            setForeMap(x, y, value);
         }
     }
 
     public void placeToBackground(int x, int y, int value) {
-        if (value==0 || (getBackMap(x,y) == 0 && !Items.BLOCKS.getValueAt(value).foreground)) {
+        if (value==0 || (getBackMap(x,y) == 0 && Items.BLOCKS.getValueAt(value).collision)) {
             setBackMap(x,y,value);
         }
     }
@@ -103,10 +103,9 @@ public class GameWorld {
         WorldGen.clear();
     }
 
-    public void load() {
-        GameSaver.loadMap();
-        foreMap = GameSaver.getLoadedForeMap();
-        backMap = GameSaver.getLoadedBackMap();
+    public void setMaps(int[][] foreMap, int[][] backMap) {
+        this.foreMap = foreMap.clone();
+        this.backMap = backMap.clone();
         WIDTH = foreMap.length;
         HEIGHT = foreMap[0].length;
     }