Changeset 168 for binary-improvements/7dtd-server-fixes/src/MapRendering

Timestamp:

Sep 5, 2014, 4:03:00 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes/src/MapRendering

Files:

• MapRenderBlockBuffer.cs (modified) (2 diffs)
• MapRendering.cs (modified) (2 diffs)

binary-improvements/7dtd-server-fixes/src/MapRendering/MapRenderBlockBuffer.cs

@@ -17 +17 @@
                 {
                         zoomLevel = level;
+                }
+
+                public void ResetBlock ()
+                {
+                        currentBlockMap = string.Empty;
                 }
 
@@ -39 +44 @@
                                 if (!fileName.Equals (currentBlockMap)) {
                                         res = true;
-                                        SaveBlock();
+                                        SaveBlock ();
                                         loadTextureFromFile (fileName);
                                 }

binary-improvements/7dtd-server-fixes/src/MapRendering/MapRendering.cs

@@ -82 +82 @@
                         Texture2D fullMapTexture = null;
 
-                        if (Directory.Exists (Constants.MAP_DIRECTORY))
-                                Directory.Delete (Constants.MAP_DIRECTORY, true);
-
-                        renderingFullMap = true;
-
                         Vector2i minChunk = default(Vector2i), maxChunk = default(Vector2i);
                         Vector2i minPos = default(Vector2i), maxPos = default(Vector2i);
@@ -99 +94 @@
                         );
 
-                        if (widthPix <= 8000 && heightPix <= 8000)
-                                fullMapTexture = new Texture2D (widthPix, heightPix);
-
                         Monitor.Enter (Instance.zoomLevelBuffers);
                         try {
+                                for (int i = 0; i < Constants.ZOOMLEVELS; i++) {
+                                        zoomLevelBuffers [i].ResetBlock ();
+                                }
+
+                                if (Directory.Exists (Constants.MAP_DIRECTORY))
+                                        Directory.Delete (Constants.MAP_DIRECTORY, true);
+
+                                renderingFullMap = true;
+
+                                if (widthPix <= 8000 && heightPix <= 8000)
+                                        fullMapTexture = new Texture2D (widthPix, heightPix);
+
                                 Vector2i curFullMapPos = default(Vector2i);
                                 Vector2i curChunkPos = default(Vector2i);