X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameSaver.java;h=5f8743dc8710a3f054b597fea29a9be5a19e6538;hb=22eccb137bf9642700f762dd39cf02ea144bdca3;hp=1bf6684682e6e6af212e4d158cb5699e36118a7b;hpb=08def9aa287e5309c12c6a4110f6b8486afd3a6c;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameSaver.java b/core/src/ru/deadsoftware/cavecraft/game/GameSaver.java
index 1bf6684..5f8743d 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameSaver.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameSaver.java
@@ -4,47 +4,34 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 import ru.deadsoftware.cavecraft.CaveGame;
 
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import java.io.*;
 import java.nio.ByteBuffer;
 
 public class GameSaver {
 
     private static final int VERSION = 0;
 
-    private static int[][] fMap, bMap;
-    private static int readIndex;
-
-    private static int bytesToInt(byte[] bytes) {
-        ByteBuffer wrapped = ByteBuffer.wrap(bytes);
-        int res = wrapped.getInt(readIndex);
-        readIndex+=4;
-        return res;
-    }
-
     private static byte[] intToBytes(int i) {
         return ByteBuffer.allocate(4).putInt(i).array();
     }
 
-    private static void saveMap(FileHandle file, int[][] map) throws IOException{
-        int rl,bl;
+    private static void saveMap(FileHandle file, int[][] map) throws IOException {
+        int rl, bl;
         int width = map.length;
         int height = map[0].length;
         BufferedOutputStream out = new BufferedOutputStream(file.write(false));
         out.write(intToBytes(VERSION));
         out.write(intToBytes(width));
         out.write(intToBytes(height));
-        for (int y=0; y<map[0].length; y++) {
+        for (int y = 0; y < height; y++) {
             bl = map[0][y];
-            rl=0;
-            for (int x=0; x<map.length; x++) {
-                if (map[x][y]!=bl) {
+            rl = 0;
+            for (int x = 0; x < width; x++) {
+                if (map[x][y] != bl) {
                     out.write(intToBytes(rl));
                     out.write(intToBytes(bl));
-                    rl=0;
-                    bl=map[x][y];
+                    rl = 0;
+                    bl = map[x][y];
                 }
                 rl++;
             }
@@ -56,85 +43,70 @@ public class GameSaver {
     }
 
     private static int[][] loadMap(FileHandle file) throws Exception {
-        int[][] map = null;
+        int[][] map;
         int ver, width, height;
-        int rl,bl;
-        byte[] data = file.readBytes();
-        readIndex = 0;
-        ver = bytesToInt(data);
+        int rl, bl;
+        DataInputStream in = new DataInputStream(file.read());
+        ver = in.readInt();
         if (VERSION == ver) {
-            width = bytesToInt(data);
-            height = bytesToInt(data);
+            width = in.readInt();
+            height = in.readInt();
             map = new int[width][height];
-            for (int y=0; y<height; y++) {
-                for (int x=0; x<width; x+=rl) {
-                    rl = bytesToInt(data);
-                    bl = bytesToInt(data);
-                    for (int i=x; i<x+rl; i++) map[i][y] = bl;
+            for (int y = 0; y < height; y++) {
+                for (int x = 0; x < width; x += rl) {
+                    rl = in.readInt();
+                    bl = in.readInt();
+                    for (int i = x; i < x + rl; i++) map[i][y] = bl;
                 }
             }
+            in.close();
         } else throw new Exception("version mismatch");
         return map;
     }
 
-    public static int[][] getLoadedForeMap() {
-        return fMap;
-    }
-
-    public static int[][] getLoadedBackMap() {
-        return bMap;
-    }
-
-    public static void loadWorld() {
-        try {
-            fMap = loadMap(Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/foremap.sav"));
-            bMap = loadMap(Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/backmap.sav"));
-        } catch (Exception e) {
-            Gdx.app.error("GameSaver",e.getMessage(),e);
-        }
-    }
-
     public static GameProc load() {
-        FileHandle file = Gdx.files.absolute(CaveGame.GAME_FOLDER+"/saves/game.sav");
+        FileHandle file = Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/game.sav");
         GameProc gameProc = null;
         try {
             ObjectInputStream in = new ObjectInputStream(file.read());
             int ver = in.readInt();
-            if (VERSION == ver) gameProc = (GameProc)in.readObject();
-                else throw new Exception("version mismatch");
+            if (VERSION == ver) gameProc = (GameProc) in.readObject();
+            else throw new Exception("version mismatch");
             in.close();
+            gameProc.world = new GameWorld();
+            gameProc.world.setMaps(
+                    loadMap(Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/foremap.sav")),
+                    loadMap(Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/backmap.sav"))
+            );
+            gameProc.physics = new GamePhysics();
+            gameProc.resetRenderer();
         } catch (Exception e) {
-            Gdx.app.error("GameSaver",e.getMessage(),e);
+            Gdx.app.error("GameSaver", e.getMessage(), e);
+            Gdx.app.exit();
         }
-        gameProc.world = new GameWorld();
-        gameProc.world.load();
-        gameProc.physics = new GamePhysics(gameProc);
-        gameProc.resetRenderer();
-        fMap = null;
-        bMap = null;
         return gameProc;
     }
 
-    public static void save(GameProc gameProc) {
-        FileHandle file = Gdx.files.absolute(CaveGame.GAME_FOLDER+"/saves/");
+    public static void save(GameProc gp) {
+        FileHandle file = Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/");
         file.mkdirs();
-        file = Gdx.files.absolute(CaveGame.GAME_FOLDER+"/saves/game.sav");
+        file = Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/game.sav");
         try {
             ObjectOutputStream out = new ObjectOutputStream(file.write(false));
             out.writeInt(VERSION);
-            out.writeObject(gameProc);
+            out.writeObject(gp);
             out.close();
-            saveMap(Gdx.files.absolute(CaveGame.GAME_FOLDER+"/saves/foremap.sav"), gameProc.world.getFullForeMap());
-            saveMap(Gdx.files.absolute(CaveGame.GAME_FOLDER+"/saves/backmap.sav"), gameProc.world.getFullBackMap());
+            saveMap(Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/foremap.sav"), gp.world.getFullForeMap());
+            saveMap(Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/backmap.sav"), gp.world.getFullBackMap());
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     public static boolean exists() {
-        return (Gdx.files.absolute(CaveGame.GAME_FOLDER+"/saves/game.sav").exists() &&
-                Gdx.files.absolute(CaveGame.GAME_FOLDER+"/saves/foremap.sav").exists() &&
-                Gdx.files.absolute(CaveGame.GAME_FOLDER+"/saves/backmap.sav").exists());
+        return (Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/game.sav").exists() &&
+                Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/foremap.sav").exists() &&
+                Gdx.files.absolute(CaveGame.GAME_FOLDER + "/saves/backmap.sav").exists());
     }
 
 }