Fixed nullreference in genDemo

Assets/Scripts/CityGen/CityGen.cs

@@ -33,6 +33,7 @@ public class CityGen : MonoBehaviour {
 			//TODO:add prefabs
 
 			this.pins = new Pin[1];
+			this.pins[0] = new Pin();
 			this.pins[0].genDemo(id);
 		}
 	}
@@ -48,11 +49,11 @@ public class CityGen : MonoBehaviour {
 	[System.Serializable]
 	public class Tile {
 		public int height;
-		public Transform transform;
+		public Vector3 orientation;
 
 		public void genDemo(int id){
 			this.height = 4 + id;
-			this.transform.rotation = new Quaternion(1.0f, 0.0f, 0.0f, 1);
+			this.orientation = new Vector3(1.0f, 0.0f, 0.0f);
 		}
 	}
 
@@ -62,7 +63,7 @@ public class CityGen : MonoBehaviour {
 		public Prefab[] prefabs;
 		public Vector2 layoutDimension;
 		[HideInInspector]
-		public int[][] layout;
+		public int[,] layout;
 		public Tile[] tiles;
 
 		/*
@@ -73,8 +74,9 @@ public class CityGen : MonoBehaviour {
 		public void genDemo(){
 
 			this.zoneTypes = new ZoneType[3];
-			for(int i = 0; i < this.zoneTypes.Length; i++)
-			{
+
+			for(int i =0; i < zoneTypes.Length; i++){
+				zoneTypes[i] = new ZoneType();
 				zoneTypes[i].genDemo(i);
 			}
 
@@ -83,14 +85,24 @@ public class CityGen : MonoBehaviour {
 			this.layoutDimension.x = 5;
 			this.layoutDimension.y = 5;
 
-			this.layout[2][2] = 1;
-			this.layout[2][3] = -1;
-			this.layout[3][2] = -1;
-			this.layout[3][3] = -1;
+			this.layout = new int[(int) this.layoutDimension.x,(int) this.layoutDimension.y];
+			this.layout[2,2] = 1;
+			this.layout[2,3] = -1;
+			this.layout[3,2] = -1;
+			this.layout[3,3] = -1;
+
+			this.tiles = new Tile[25];
 
+			this.tiles[6] = new Tile();
 			this.tiles[6].genDemo(1);
+
+			this.tiles[7] = new Tile();
 			this.tiles[7].genDemo(-1);
+
+			this.tiles[11] = new Tile();
 			this.tiles[11].genDemo(-1);
+
+			this.tiles[12] = new Tile();
 			this.tiles[12].genDemo(-1);
 
 		}