From adb56a46f49127911a2df169c86f2cdfde034966 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Wed, 11 Apr 2007 05:19:27 +0000 Subject: Major ass changes to terrain (now uses libTerrain-BSD!) and all-round improvements to code quality. Terrain saving/loading may work now (running through setHeights1D and getHeights1D before DB4o) **WARNING: UNTESTED** --- OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs | 6 +++--- OpenSim.Storage/LocalStorageDb4o/MapStorage.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim.Storage/LocalStorageDb4o') diff --git a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs index 189ee1a..da77701 100644 --- a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs +++ b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs @@ -118,11 +118,11 @@ namespace OpenSim.Storage.LocalStorageDb4o } } - public float[,] LoadWorld() + public float[] LoadWorld() { OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Loading world...."); //World blank = new World(); - float[,] heightmap = null; + float[] heightmap = null; OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Looking for a heightmap in local DB"); IObjectSet world_result = db.Get(typeof(MapStorage)); if (world_result.Count > 0) @@ -150,7 +150,7 @@ namespace OpenSim.Storage.LocalStorageDb4o return heightmap; } - public void SaveMap(float[,] heightmap) + public void SaveMap(float[] heightmap) { IObjectSet world_result = db.Get(typeof(MapStorage)); if (world_result.Count > 0) diff --git a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs index dc5793e..db590ff 100644 --- a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs +++ b/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs @@ -6,7 +6,7 @@ namespace OpenSim.Storage.LocalStorageDb4o { public class MapStorage { - public float[,] Map; + public float[] Map; public MapStorage() { -- cgit v1.1