Changeset 351 for binary-improvements/7dtd-server-fixes/src/FileCache/MapTileCache.cs

Timestamp:

Jan 19, 2019, 6:12:21 PM (6 years ago)

Author:

alloc

Message:

Fixed game version compatibility of GamePrefs
Code style cleanup (mostly argument names)

File:

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

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

@@ -25 +25 @@
                 }
 
-                public void SetZoomCount (int count) {
-                        cache = new CurrentZoomFile[count];
+                public void SetZoomCount (int _count) {
+                        cache = new CurrentZoomFile[_count];
                         for (int i = 0; i < cache.Length; i++) {
                                 cache [i] = new CurrentZoomFile ();
@@ -32 +32 @@
                 }
 
-                public byte[] LoadTile (int zoomlevel, string filename) {
+                public byte[] LoadTile (int _zoomlevel, string _filename) {
                         try {
                                 lock (cache) {
-                                        CurrentZoomFile cacheEntry = cache [zoomlevel];
+                                        CurrentZoomFile cacheEntry = cache [_zoomlevel];
                                         
-                                        if (cacheEntry.filename == null || !cacheEntry.filename.Equals (filename)) {
-                                                cacheEntry.filename = filename;
+                                        if (cacheEntry.filename == null || !cacheEntry.filename.Equals (_filename)) {
+                                                cacheEntry.filename = _filename;
 
-                                                if (!File.Exists (filename)) {
+                                                if (!File.Exists (_filename)) {
                                                         cacheEntry.pngData = null;
                                                         return null;
@@ -46 +46 @@
 
                                                 Profiler.BeginSample ("ReadPng");
-                                                cacheEntry.pngData = ReadAllBytes (filename);
+                                                cacheEntry.pngData = ReadAllBytes (_filename);
                                                 Profiler.EndSample ();
                                         }
@@ -59 +59 @@
                 }
 
-                public void SaveTile (int zoomlevel, byte[] contentPng) {
+                public void SaveTile (int _zoomlevel, byte[] _contentPng) {
                         try {
                                 lock (cache) {
-                                        CurrentZoomFile cacheEntry = cache [zoomlevel];
+                                        CurrentZoomFile cacheEntry = cache [_zoomlevel];
 
                                         string file = cacheEntry.filename;
@@ -69 +69 @@
                                         }
                                         
-                                        cacheEntry.pngData = contentPng;
+                                        cacheEntry.pngData = _contentPng;
 
                                         Profiler.BeginSample ("WritePng");
                                         using (Stream stream = new FileStream (file, FileMode.Create, FileAccess.ReadWrite, FileShare.None,
                                                 4096)) {
-                                                stream.Write (contentPng, 0, contentPng.Length);
+                                                stream.Write (_contentPng, 0, _contentPng.Length);
                                         }
                                         Profiler.EndSample ();
@@ -83 +83 @@
                 }
 
-                public void ResetTile (int zoomlevel) {
+                public void ResetTile (int _zoomlevel) {
                         try {
                                 lock (cache) {
-                                        cache [zoomlevel].filename = null;
-                                        cache [zoomlevel].pngData = null;
+                                        cache [_zoomlevel].filename = null;
+                                        cache [_zoomlevel].pngData = null;
                                 }
                         } catch (Exception e) {
@@ -94 +94 @@
                 }
 
-                public override byte[] GetFileContent (string filename) {
+                public override byte[] GetFileContent (string _filename) {
                         try {
                                 lock (cache) {
                                         foreach (CurrentZoomFile czf in cache) {
-                                                if (czf.filename != null && czf.filename.Equals (filename)) {
+                                                if (czf.filename != null && czf.filename.Equals (_filename)) {
                                                         return czf.pngData;
                                                 }
                                         }
 
-                                        if (!File.Exists (filename)) {
+                                        if (!File.Exists (_filename)) {
                                                 return transparentTile;
                                         }
 
-                                        return ReadAllBytes (filename);
+                                        return ReadAllBytes (_filename);
                                 }
                         } catch (Exception e) {