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

Timestamp:

Sep 12, 2014, 11:14:11 AM (10 years ago)

Author:

alloc

Message:

fixes

Location:

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

Files:

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

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

@@ -37 +37 @@
                 {
                         bool res = false;
-                        Monitor.Enter (blockMap);
-                        try {
+                        lock (blockMap) {
                                 string folder = Constants.MAP_DIRECTORY + "/" + (zoomLevel) + "/" + block.x;
                                 string fileName = folder + "/" + block.y + ".png";
@@ -48 +47 @@
                                 }
                                 currentBlockMap = fileName;
-                        } finally {
-                                Monitor.Exit (blockMap);
                         }
                         return res;

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

@@ -55 +55 @@
                                         try {
                                                 if (!Instance.renderingFullMap) {
-                                                        Monitor.Enter (Instance.zoomLevelBuffers);
-                                                        try {
+                                                        lock (Instance.zoomLevelBuffers) {
                                                                 Chunk c = (Chunk)o;
                                                                 Vector3i cPos = c.GetWorldPos ();
@@ -72 +71 @@
                                                                         Instance.chunkSaveTimer.Start ();
                                                                 }
-                                                        } finally {
-                                                                Monitor.Exit (Instance.zoomLevelBuffers);
                                                         }
                                                 }
@@ -103 +100 @@
                         );
 
-                        Monitor.Enter (Instance.zoomLevelBuffers);
-                        try {
+                        lock (Instance.zoomLevelBuffers) {
                                 for (int i = 0; i < Constants.ZOOMLEVELS; i++) {
                                         zoomLevelBuffers [i].ResetBlock ();
@@ -152 +148 @@
                                         Log.Out (String.Format ("RenderMap: {0}/{1} ({2}%)", curFullMapPos.x, widthPix, (int)((float)curFullMapPos.x / widthPix * 100)));
                                 }
-                        } finally {
-                                Monitor.Exit (Instance.zoomLevelBuffers);
                         }
 
@@ -178 +172 @@
                 private void TimedRendering (object source, System.Timers.ElapsedEventArgs e)
                 {
-                        Monitor.Enter (zoomLevelBuffers);
-                        try {
+                        lock (zoomLevelBuffers) {
                                 RenderDirtyChunks ();
                                 if (dirtyChunks.Count > 0)
                                         Instance.chunkSaveTimer.Start ();
-                        } finally {
-                                Monitor.Exit (zoomLevelBuffers);
                         }
                 }