From d29218c7c3f4f95ecc5f0513ebd375f8c36da0c6 Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Sat, 31 Aug 2013 19:28:09 +0200
Subject: [PATCH] Prepare data placeholder "worldData".

---
 AndorsTrail/AndroidManifest.xml                |  2 +-
 .../AndorsTrail/AndorsTrailApplication.java    |  2 +-
 .../rpg/AndorsTrail/model/ModelContainer.java  |  8 ++++++++
 .../gpl/rpg/AndorsTrail/model/WorldData.java   | 18 ++++++++++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/WorldData.java

diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 697437432..e18fc826b 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -3,7 +3,7 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="39"
+	android:versionCode="40"
 	android:versionName="0.7.1dev"
 	android:installLocation="auto"
 	>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index b76881a0a..7f0b12ccb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -17,7 +17,7 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
 	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || true;
-	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 39;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 40;
 	public static final String CURRENT_VERSION_DISPLAY = "0.7.1dev";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
index f77ba7111..114d9cdba 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
@@ -16,6 +16,7 @@ public final class ModelContainer {
 	public final InterfaceData uiSelections;
 	public final CombatLog combatLog = new CombatLog();
 	public final GameStatistics statistics;
+	public final WorldData worldData;
 	public PredefinedMap currentMap;
 	public LayeredTileMap currentTileMap;
 
@@ -23,6 +24,7 @@ public final class ModelContainer {
 		player = new Player();
 		uiSelections = new InterfaceData();
 		statistics = new GameStatistics();
+		worldData = new WorldData();
 	}
 
 	// ====== PARCELABLE ===================================================================
@@ -36,6 +38,11 @@ public final class ModelContainer {
 		}
 		this.statistics = new GameStatistics(src, world, fileversion);
 		this.currentTileMap = null;
+		if (fileversion >= 40) {
+			this.worldData = new WorldData(src, fileversion);
+		} else {
+			this.worldData = new WorldData();
+		}
 	}
 
 	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
@@ -43,5 +50,6 @@ public final class ModelContainer {
 		dest.writeUTF(currentMap.name);
 		uiSelections.writeToParcel(dest, flags);
 		statistics.writeToParcel(dest, flags);
+		worldData.writeToParcel(dest, flags);
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/WorldData.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/WorldData.java
new file mode 100644
index 000000000..4c18c9c88
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/WorldData.java
@@ -0,0 +1,18 @@
+package com.gpl.rpg.AndorsTrail.model;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public final class WorldData {
+
+	public WorldData() {}
+
+	// ====== PARCELABLE ===================================================================
+
+	public WorldData(DataInputStream src, int fileversion) throws IOException {
+	}
+
+	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
+	}
+}