* Cleaned up code in Terrain, Tree and Map modules.

* Fixed a bug with Terragen loader where it would do bad things on a non 256x256 sized terrain. Now loads the array correctly. 
* Moved MapImageModule.cs to Modules/World/WorldMap
* Changed Location.RegionHandle to use Helpers.GetUlong instead of doing it ourselves.

5 files changed, 38 insertions, 30 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 9730b16..484bb89 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -61,9 +61,10 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 
             ITerrainChannel retval = new TerrainChannel(file.Width, file.Height);
 
-            int x, y;
+            int x;
             for (x = 0; x < file.Width; x++)
             {
+                int y;
                 for (y = 0; y < file.Height; y++)
                 {
                     retval[x, y] = file.GetPixel(x, y).GetBrightness() * 128;
@@ -103,11 +104,11 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
         /// </summary>
         /// <param name="map">The terrain channel to export to bitmap</param>
         /// <returns>A System.Drawing.Bitmap containing a grayscale image</returns>
-        protected Bitmap CreateGrayscaleBitmapFromMap(ITerrainChannel map)
+        protected static Bitmap CreateGrayscaleBitmapFromMap(ITerrainChannel map)
         {
             Bitmap bmp = new Bitmap(map.Width, map.Height);
 
-            int pallete = 256;
+            const int pallete = 256;
 
             Color[] grays = new Color[pallete];
             for (int i = 0; i < grays.Length; i++)
@@ -138,7 +139,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
         /// </summary>
         /// <param name="map">The terrain channel to export to bitmap</param>
         /// <returns>A System.Drawing.Bitmap containing a coloured image</returns>
-        protected Bitmap CreateBitmapFromMap(ITerrainChannel map)
+        protected static Bitmap CreateBitmapFromMap(ITerrainChannel map)
         {
             Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
 
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs
index d58926e..628c201 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
             return "JPEG";
         }
 
-        private Bitmap CreateBitmapFromMap(ITerrainChannel map)
+        private static Bitmap CreateBitmapFromMap(ITerrainChannel map)
         {
             Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
 
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
index 5d6723f..1f6208c 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
@@ -42,12 +42,13 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
             FileInfo file = new FileInfo(filename);
             FileStream s = file.Open(FileMode.Open, FileAccess.Read);
             BinaryReader bs = new BinaryReader(s);
-            int x, y;
+            int y;
             for (y = 0; y < retval.Height; y++)
             {
+                int x;
                 for (x = 0; x < retval.Width; x++)
                 {
-                    retval[x, y] = (double) bs.ReadByte() * ((double) bs.ReadByte() / 127.0);
+                    retval[x, y] = bs.ReadByte() * (bs.ReadByte() / 127.0);
                     bs.ReadBytes(11); // Advance the stream to next bytes.
                 }
             }
@@ -71,18 +72,21 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 
             // Generate a smegging big lookup table to speed the operation up (it needs it)
             double[] lookupHeightTable = new double[65536];
-            int i, j, x, y;
+            int i;
+            int y;
             for (i = 0; i < 256; i++)
             {
+                int j;
                 for (j = 0; j < 256; j++)
                 {
-                    lookupHeightTable[i + (j * 256)] = ((double) i * ((double) j / 127.0));
+                    lookupHeightTable[i + (j * 256)] = (i * (j / 127.0));
                 }
             }
 
             // Output the calculated raw
             for (y = 0; y < map.Height; y++)
             {
+                int x;
                 for (x = 0; x < map.Width; x++)
                 {
                     double t = map[x, y];
@@ -100,15 +104,15 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 
                     byte red = (byte) (index & 0xFF);
                     byte green = (byte) ((index >> 8) & 0xFF);
-                    byte blue = 20;
-                    byte alpha1 = 0; // Land Parcels
-                    byte alpha2 = 0; // For Sale Land
-                    byte alpha3 = 0; // Public Edit Object
-                    byte alpha4 = 0; // Public Edit Land
-                    byte alpha5 = 255; // Safe Land
-                    byte alpha6 = 255; // Flying Allowed
-                    byte alpha7 = 255; // Create Landmark
-                    byte alpha8 = 255; // Outside Scripts
+                    const byte blue = 20;
+                    const byte alpha1 = 0;
+                    const byte alpha2 = 0;
+                    const byte alpha3 = 0;
+                    const byte alpha4 = 0;
+                    const byte alpha5 = 255;
+                    const byte alpha6 = 255;
+                    const byte alpha7 = 255;
+                    const byte alpha8 = 255;
                     byte alpha9 = red;
                     byte alpha10 = green;
 
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs
index fd2136c..689abcf 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs
@@ -46,9 +46,10 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
             FileInfo file = new FileInfo(filename);
             FileStream s = file.Open(FileMode.Open, FileAccess.Read);
             BinaryReader bs = new BinaryReader(s);
-            int x, y;
+            int y;
             for (y = 0; y < retval.Height; y++)
             {
+                int x;
                 for (x = 0; x < retval.Width; x++)
                 {
                     retval[x, y] = bs.ReadSingle();
@@ -69,7 +70,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
             FileStream s = file.Open(FileMode.Open, FileAccess.Read);
             BinaryReader bs = new BinaryReader(s);
 
-            int currFileXOffset = 0;
             int currFileYOffset = 0;
 
             // if our region isn't on the first Y section of the areas to be landscaped, then
@@ -84,11 +84,11 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 
             // got to the Y start offset within the file of our region
             // so read the file bits associated with our region
-            int x, y;
+            int y;
             // for each Y within our Y offset
             for (y = 0; y < sectionHeight; y++)
             {
-                currFileXOffset = 0;
+                int currFileXOffset = 0;
 
                 // if our region isn't the first X section of the areas to be landscaped, then
                 // advance the stream to the X start pos of our section in the file
@@ -100,6 +100,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
                 }
 
                 // got to our X offset, so write our regions X line
+                int x;
                 for (x = 0; x < sectionWidth; x++)
                 {
                     // Read a strip and continue
@@ -130,9 +131,10 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
             FileStream s = file.Open(FileMode.Create, FileAccess.Write);
             BinaryWriter bs = new BinaryWriter(s);
 
-            int x, y;
+            int y;
             for (y = 0; y < map.Height; y++)
             {
+                int x;
                 for (x = 0; x < map.Width; x++)
                 {
                     bs.Write((float) map[x, y]);
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs
index 7cb4b00..fe36cf7 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs
@@ -50,14 +50,15 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
             BinaryReader bs = new BinaryReader(s);
 
             bool eof = false;
-            if (ASCIIEncoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN ")
+            if (Encoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN ")
             {
+                int w = 256;
+                int h = 256;
+
                 // Terragen file
                 while (eof == false)
                 {
-                    int w = 256;
-                    int h = 256;
-                    string tmp = ASCIIEncoding.ASCII.GetString(bs.ReadBytes(4));
+                    string tmp = Encoding.ASCII.GetString(bs.ReadBytes(4));
                     switch (tmp)
                     {
                         case "SIZE":
@@ -79,12 +80,13 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
                             Int16 heightScale = bs.ReadInt16();
                             Int16 baseHeight = bs.ReadInt16();
                             retval = new TerrainChannel(w, h);
-                            int x, y;
+                            int x;
                             for (x = 0; x < w; x++)
                             {
+                                int y;
                                 for (y = 0; y < h; y++)
                                 {
-                                    retval[x, y] = (double) baseHeight + (double) bs.ReadInt16() * (double) heightScale / 65536.0;
+                                    retval[x, y] = baseHeight + bs.ReadInt16() * (double) heightScale / 65536.0;
                                 }
                             }
                             break;
@@ -103,7 +105,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 
         public void SaveFile(string filename, ITerrainChannel map)
         {
-            char[] header = "TERRAGENTERRAIN".ToCharArray();
             throw new NotImplementedException();
         }