diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
index a2107fa956fd9bc0948d2e02fd0f770b511b1183..5ba62a2e1307fc7dd16e0169dc0624960ce46217 100644 (file)
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
-import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.TimeUtils;
import com.badlogic.gdx.utils.TimeUtils;
-import ru.deadsoftware.cavecraft.*;
-import ru.deadsoftware.cavecraft.AppState;
+import ru.deadsoftware.cavecraft.CaveGame;
+import ru.deadsoftware.cavecraft.GameScreen;
import ru.deadsoftware.cavecraft.game.mobs.Mob;
import ru.deadsoftware.cavecraft.game.mobs.Pig;
import ru.deadsoftware.cavecraft.game.objects.Player;
import ru.deadsoftware.cavecraft.game.mobs.Mob;
import ru.deadsoftware.cavecraft.game.mobs.Pig;
import ru.deadsoftware.cavecraft.game.objects.Player;
+import ru.deadsoftware.cavecraft.misc.AppState;
+import ru.deadsoftware.cavecraft.misc.Assets;
-public class GameProc {
+import java.io.Serializable;
+import java.util.ArrayList;
+
+public class GameProc implements Serializable{
public static double RUN_TIME = 0;
public Player player;
public static double RUN_TIME = 0;
public Player player;
- public Array<Mob> mobs;
+ public ArrayList<Mob> mobs;
- public GameWorld world;
- public GameRenderer renderer;
- public GamePhysics physics;
+ public transient GameWorld world;
+ public transient GameRenderer renderer;
+ public transient GamePhysics physics;
public int cursorX, cursorY;
public int invSlot;
public int ctrlMode;
public int cursorX, cursorY;
public int invSlot;
public int ctrlMode;
+ public int creativeScroll, maxCreativeScroll;
public boolean isTouchDown, isKeyDown;
public int touchDownX, touchDownY, keyDownCode;
public boolean isTouchDown, isKeyDown;
public int touchDownX, touchDownY, keyDownCode;
public GameProc() {
world = new GameWorld();
public GameProc() {
world = new GameWorld();
- if (WorldSaver.exists()) {
- world.load();
- } else {
- world.generate(1024, 256);
+ world.generate(1024,256);
+ player = new Player(world.getSpawnPoint());
+ mobs = new ArrayList<Mob>();
+ for (int i=0; i<16; i++) {
+ mobs.add(new Pig(i*256, 196*16));
}
}
+ physics = new GamePhysics(this);
if (CaveGame.TOUCH) {
renderer = new GameRenderer(this,320,
320*((float)GameScreen.getHeight()/GameScreen.getWidth()));
} else {
if (CaveGame.TOUCH) {
renderer = new GameRenderer(this,320,
320*((float)GameScreen.getHeight()/GameScreen.getWidth()));
} else {
+ ctrlMode = 1;
renderer = new GameRenderer(this,480,
480*((float)GameScreen.getHeight()/GameScreen.getWidth()));
}
renderer = new GameRenderer(this,480,
480*((float)GameScreen.getHeight()/GameScreen.getWidth()));
}
- physics = new GamePhysics(this);
- player = new Player(world.getSpawnPoint(0));
- mobs = new Array<Mob>();
- for (int i=0; i<world.getWidth(); i+=64) {
- mobs.add(new Pig(i*16, (int)world.getSpawnPoint(i).y, world));
- }
- if (!CaveGame.TOUCH) ctrlMode = 1;
+ maxCreativeScroll = Items.BLOCKS.size/40;
+ GameSaver.save(this);
}
public void resetRenderer() {
}
public void resetRenderer() {
if (touchDownButton== Input.Buttons.RIGHT) {
world.placeToBackground(cursorX, cursorY,
player.inventory[invSlot]);
if (touchDownButton== Input.Buttons.RIGHT) {
world.placeToBackground(cursorX, cursorY,
player.inventory[invSlot]);
- } else if (touchDownButton==Input.Buttons.LEFT &&
- touchDownY< Assets.invBar.getRegionHeight() &&
+ } else if (touchDownY< Assets.invBar.getRegionHeight() &&
touchDownX>renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2 &&
touchDownX<renderer.camera.viewportWidth/2+Assets.invBar.getRegionWidth()/2) {
CaveGame.STATE = AppState.GAME_CREATIVE_INV;
touchDownX>renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2 &&
touchDownX<renderer.camera.viewportWidth/2+Assets.invBar.getRegionWidth()/2) {
CaveGame.STATE = AppState.GAME_CREATIVE_INV;