Changeset 391 for binary-improvements2/7dtd-server-fixes/src/FileCache/MapTileCache.cs

Timestamp:

Aug 7, 2022, 3:02:24 PM (2 years ago)

Author:

alloc

Message:

Major refactoring/cleanup

File:

• binary-improvements2/7dtd-server-fixes/src/FileCache/MapTileCache.cs (modified) (2 diffs)

binary-improvements2/7dtd-server-fixes/src/FileCache/MapTileCache.cs

@@ -36 +36 @@
                                 lock (cache) {
                                         CurrentZoomFile cacheEntry = cache [_zoomlevel];
-                                        
-                                        if (cacheEntry.filename == null || !cacheEntry.filename.Equals (_filename)) {
-                                                cacheEntry.filename = _filename;
 
-                                                if (!File.Exists (_filename)) {
-                                                        cacheEntry.pngData = null;
-                                                        return null;
-                                                }
+                                        if (cacheEntry.filename != null && cacheEntry.filename.Equals (_filename)) {
+                                                return cacheEntry.pngData;
+                                        }
 
-                                                Profiler.BeginSample ("ReadPng");
-                                                cacheEntry.pngData = ReadAllBytes (_filename);
-                                                Profiler.EndSample ();
+                                        cacheEntry.filename = _filename;
+
+                                        if (!File.Exists (_filename)) {
+                                                cacheEntry.pngData = null;
+                                                return null;
                                         }
+
+                                        Profiler.BeginSample ("ReadPng");
+                                        cacheEntry.pngData = ReadAllBytes (_filename);
+                                        Profiler.EndSample ();
 
                                         return cacheEntry.pngData;
@@ -103 +105 @@
                                         }
 
-                                        if (!File.Exists (_filename)) {
-                                                return transparentTile;
-                                        }
-
-                                        return ReadAllBytes (_filename);
+                                        return !File.Exists (_filename) ? transparentTile : ReadAllBytes (_filename);
                                 }
                         } catch (Exception e) {