diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameSaver.java b/core/src/ru/deadsoftware/cavedroid/game/GameSaver.java
index cb52b3c76b126812e355c43d9ce076c7d5749140..dd1618640957ce3bbb200a7f509145daad838674 100644 (file)
import ru.deadsoftware.cavedroid.MainConfig;
import ru.deadsoftware.cavedroid.game.mobs.MobsController;
import ru.deadsoftware.cavedroid.game.model.block.Block;
import ru.deadsoftware.cavedroid.MainConfig;
import ru.deadsoftware.cavedroid.game.mobs.MobsController;
import ru.deadsoftware.cavedroid.game.model.block.Block;
-import ru.deadsoftware.cavedroid.game.objects.DropController;
+import ru.deadsoftware.cavedroid.game.objects.drop.DropController;
+import ru.deadsoftware.cavedroid.game.objects.furnace.FurnaceController;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
import javax.annotation.CheckForNull;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
import javax.annotation.CheckForNull;
@CheckForNull
private DropController mDropController;
@CheckForNull
@CheckForNull
private DropController mDropController;
@CheckForNull
+ private FurnaceController mFurnaceController;
+ @CheckForNull
private Block[][] mForeMap, mBackMap;
private Block[][] mForeMap, mBackMap;
- public Data(MobsController mobsController, DropController dropController, Block[][] foreMap, Block[][] backMap) {
+ public Data(MobsController mobsController,
+ DropController dropController,
+ FurnaceController furnaceController,
+ Block[][] foreMap,
+ Block[][] backMap) {
mMobsController = mobsController;
mDropController = dropController;
mMobsController = mobsController;
mDropController = dropController;
+ mFurnaceController = furnaceController;
mForeMap = foreMap;
mBackMap = backMap;
}
mForeMap = foreMap;
mBackMap = backMap;
}
return dropController;
}
return dropController;
}
+ public FurnaceController retrueveFurnaceController() {
+ assert mFurnaceController != null;
+ FurnaceController furnaceController = mFurnaceController;
+ mFurnaceController = null;
+ return furnaceController;
+ }
+
public Block[][] retrieveForeMap() {
assert mForeMap != null;
Block[][] foreMap = mForeMap;
public Block[][] retrieveForeMap() {
assert mForeMap != null;
Block[][] foreMap = mForeMap;
int version = in.readInt();
DropController dropController;
MobsController mobsController;
int version = in.readInt();
DropController dropController;
MobsController mobsController;
+ FurnaceController furnaceController;
if (SAVE_VERSION == version) {
dropController = (DropController) in.readObject();
mobsController = (MobsController) in.readObject();
if (SAVE_VERSION == version) {
dropController = (DropController) in.readObject();
mobsController = (MobsController) in.readObject();
+ furnaceController = (FurnaceController) in.readObject();
} else {
throw new Exception("version mismatch");
}
} else {
throw new Exception("version mismatch");
}
throw new Exception("couldn't load");
}
throw new Exception("couldn't load");
}
- return new Data(mobsController, dropController, foreMap, backMap);
+ return new Data(mobsController, dropController, furnaceController, foreMap, backMap);
} catch (Exception e) {
Gdx.app.error("GameSaver", e.getMessage());
}
} catch (Exception e) {
Gdx.app.error("GameSaver", e.getMessage());
}
public static void save(MainConfig mainConfig,
DropController dropController,
MobsController mobsController,
public static void save(MainConfig mainConfig,
DropController dropController,
MobsController mobsController,
+ FurnaceController furnaceController,
GameWorld gameWorld) {
String folder = mainConfig.getGameFolder();
FileHandle file = Gdx.files.absolute(folder + "/saves/");
GameWorld gameWorld) {
String folder = mainConfig.getGameFolder();
FileHandle file = Gdx.files.absolute(folder + "/saves/");
out.writeInt(SAVE_VERSION);
out.writeObject(dropController);
out.writeObject(mobsController);
out.writeInt(SAVE_VERSION);
out.writeObject(dropController);
out.writeObject(mobsController);
+ out.writeObject(furnaceController);
out.close();
saveDict(Gdx.files.absolute(folder + "/saves/dict"), dict);
out.close();
saveDict(Gdx.files.absolute(folder + "/saves/dict"), dict);