Index: binary-improvements/7dtd-server-fixes/src/BlockingQueue.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/BlockingQueue.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/BlockingQueue.cs (revision 351) @@ -7,7 +7,7 @@ private bool closing; - public void Enqueue (T item) { + public void Enqueue (T _item) { lock (queue) { - queue.Enqueue (item); + queue.Enqueue (_item); Monitor.PulseAll (queue); } Index: binary-improvements/7dtd-server-fixes/src/FileCache/AbstractCache.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/FileCache/AbstractCache.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/FileCache/AbstractCache.cs (revision 351) @@ -1,5 +1,5 @@ namespace AllocsFixes.FileCache { public abstract class AbstractCache { - public abstract byte[] GetFileContent (string filename); + public abstract byte[] GetFileContent (string _filename); } } Index: binary-improvements/7dtd-server-fixes/src/FileCache/DirectAccess.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/FileCache/DirectAccess.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/FileCache/DirectAccess.cs (revision 351) @@ -5,11 +5,11 @@ // Not caching at all, simply reading from disk on each request public class DirectAccess : AbstractCache { - public override byte[] GetFileContent (string filename) { + public override byte[] GetFileContent (string _filename) { try { - if (!File.Exists (filename)) { + if (!File.Exists (_filename)) { return null; } - return File.ReadAllBytes (filename); + return File.ReadAllBytes (_filename); } catch (Exception e) { Log.Out ("Error in DirectAccess.GetFileContent: " + e); Index: binary-improvements/7dtd-server-fixes/src/FileCache/MapTileCache.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/FileCache/MapTileCache.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/FileCache/MapTileCache.cs (revision 351) @@ -25,6 +25,6 @@ } - 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,13 +32,13 @@ } - 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,5 +46,5 @@ Profiler.BeginSample ("ReadPng"); - cacheEntry.pngData = ReadAllBytes (filename); + cacheEntry.pngData = ReadAllBytes (_filename); Profiler.EndSample (); } @@ -59,8 +59,8 @@ } - 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,10 +69,10 @@ } - 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,9 +83,9 @@ } - 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,18 +94,18 @@ } - 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) { Index: binary-improvements/7dtd-server-fixes/src/FileCache/SimpleCache.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/FileCache/SimpleCache.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/FileCache/SimpleCache.cs (revision 351) @@ -8,16 +8,16 @@ private readonly Dictionary fileCache = new Dictionary (); - public override byte[] GetFileContent (string filename) { + public override byte[] GetFileContent (string _filename) { try { lock (fileCache) { - if (!fileCache.ContainsKey (filename)) { - if (!File.Exists (filename)) { + if (!fileCache.ContainsKey (_filename)) { + if (!File.Exists (_filename)) { return null; } - fileCache.Add (filename, File.ReadAllBytes (filename)); + fileCache.Add (_filename, File.ReadAllBytes (_filename)); } - return fileCache [filename]; + return fileCache [_filename]; } } catch (Exception e) { Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONArray.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONArray.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONArray.cs (revision 351) @@ -6,7 +6,7 @@ private readonly List nodes = new List (); - public JSONNode this [int index] { - get { return nodes [index]; } - set { nodes [index] = value; } + public JSONNode this [int _index] { + get { return nodes [_index]; } + set { nodes [_index] = value; } } @@ -15,51 +15,51 @@ } - public void Add (JSONNode node) { - nodes.Add (node); + public void Add (JSONNode _node) { + nodes.Add (_node); } - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { - stringBuilder.Append ("["); - if (prettyPrint) { - stringBuilder.Append ('\n'); + public override void ToString (StringBuilder _stringBuilder, bool _prettyPrint = false, int _currentLevel = 0) { + _stringBuilder.Append ("["); + if (_prettyPrint) { + _stringBuilder.Append ('\n'); } foreach (JSONNode n in nodes) { - if (prettyPrint) { - stringBuilder.Append (new string ('\t', currentLevel + 1)); + if (_prettyPrint) { + _stringBuilder.Append (new string ('\t', _currentLevel + 1)); } - n.ToString (stringBuilder, prettyPrint, currentLevel + 1); - stringBuilder.Append (","); - if (prettyPrint) { - stringBuilder.Append ('\n'); + n.ToString (_stringBuilder, _prettyPrint, _currentLevel + 1); + _stringBuilder.Append (","); + if (_prettyPrint) { + _stringBuilder.Append ('\n'); } } if (nodes.Count > 0) { - stringBuilder.Remove (stringBuilder.Length - (prettyPrint ? 2 : 1), 1); + _stringBuilder.Remove (_stringBuilder.Length - (_prettyPrint ? 2 : 1), 1); } - if (prettyPrint) { - stringBuilder.Append (new string ('\t', currentLevel)); + if (_prettyPrint) { + _stringBuilder.Append (new string ('\t', _currentLevel)); } - stringBuilder.Append ("]"); + _stringBuilder.Append ("]"); } - public static JSONArray Parse (string json, ref int offset) { + public static JSONArray Parse (string _json, ref int _offset) { //Log.Out ("ParseArray enter (" + offset + ")"); JSONArray arr = new JSONArray (); bool nextElemAllowed = true; - offset++; + _offset++; while (true) { - Parser.SkipWhitespace (json, ref offset); + Parser.SkipWhitespace (_json, ref _offset); - switch (json [offset]) { + switch (_json [_offset]) { case ',': if (!nextElemAllowed) { nextElemAllowed = true; - offset++; + _offset++; } else { throw new MalformedJSONException ( @@ -69,10 +69,10 @@ break; case ']': - offset++; + _offset++; //Log.Out ("JSON:Parsed Array: " + arr.ToString ()); return arr; default: - arr.Add (Parser.ParseInternal (json, ref offset)); + arr.Add (Parser.ParseInternal (_json, ref _offset)); nextElemAllowed = false; break; Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONBoolean.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONBoolean.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONBoolean.cs (revision 351) @@ -5,6 +5,6 @@ private readonly bool value; - public JSONBoolean (bool value) { - this.value = value; + public JSONBoolean (bool _value) { + value = _value; } @@ -13,20 +13,20 @@ } - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { - stringBuilder.Append (value ? "true" : "false"); + public override void ToString (StringBuilder _stringBuilder, bool _prettyPrint = false, int _currentLevel = 0) { + _stringBuilder.Append (value ? "true" : "false"); } - public static JSONBoolean Parse (string json, ref int offset) { + public static JSONBoolean Parse (string _json, ref int _offset) { //Log.Out ("ParseBool enter (" + offset + ")"); - if (json.Substring (offset, 4).Equals ("true")) { + if (_json.Substring (_offset, 4).Equals ("true")) { //Log.Out ("JSON:Parsed Bool: true"); - offset += 4; + _offset += 4; return new JSONBoolean (true); } - if (json.Substring (offset, 5).Equals ("false")) { + if (_json.Substring (_offset, 5).Equals ("false")) { //Log.Out ("JSON:Parsed Bool: false"); - offset += 5; + _offset += 5; return new JSONBoolean (false); } Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONNode.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONNode.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONNode.cs (revision 351) @@ -3,5 +3,5 @@ namespace AllocsFixes.JSON { public abstract class JSONNode { - public abstract void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0); + public abstract void ToString (StringBuilder _stringBuilder, bool _prettyPrint = false, int _currentLevel = 0); public override string ToString () { Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONNull.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONNull.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONNull.cs (revision 351) @@ -3,17 +3,17 @@ namespace AllocsFixes.JSON { public class JSONNull : JSONValue { - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { - stringBuilder.Append ("null"); + public override void ToString (StringBuilder _stringBuilder, bool _prettyPrint = false, int _currentLevel = 0) { + _stringBuilder.Append ("null"); } - public static JSONNull Parse (string json, ref int offset) { + public static JSONNull Parse (string _json, ref int _offset) { //Log.Out ("ParseNull enter (" + offset + ")"); - if (!json.Substring (offset, 4).Equals ("null")) { + if (!_json.Substring (_offset, 4).Equals ("null")) { throw new MalformedJSONException ("No valid null value found"); } //Log.Out ("JSON:Parsed Null"); - offset += 4; + _offset += 4; return new JSONNull (); } Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONNumber.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONNumber.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONNumber.cs (revision 351) @@ -6,6 +6,6 @@ private readonly double value; - public JSONNumber (double value) { - this.value = value; + public JSONNumber (double _value) { + value = _value; } @@ -18,9 +18,9 @@ } - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { - stringBuilder.Append (value.ToCultureInvariantString ()); + public override void ToString (StringBuilder _stringBuilder, bool _prettyPrint = false, int _currentLevel = 0) { + _stringBuilder.Append (value.ToCultureInvariantString ()); } - public static JSONNumber Parse (string json, ref int offset) { + public static JSONNumber Parse (string _json, ref int _offset) { //Log.Out ("ParseNumber enter (" + offset + ")"); StringBuilder sbNum = new StringBuilder (); @@ -28,12 +28,12 @@ bool hasDec = false; bool hasExp = false; - while (offset < json.Length) { - if (json [offset] >= '0' && json [offset] <= '9') { + while (_offset < _json.Length) { + if (_json [_offset] >= '0' && _json [_offset] <= '9') { if (hasExp) { - sbExp.Append (json [offset]); + sbExp.Append (_json [_offset]); } else { - sbNum.Append (json [offset]); + sbNum.Append (_json [_offset]); } - } else if (json [offset] == '.') { + } else if (_json [_offset] == '.') { if (hasExp) { throw new MalformedJSONException ("Decimal separator in exponent"); @@ -50,5 +50,5 @@ sbNum.Append ('.'); hasDec = true; - } else if (json [offset] == '-') { + } else if (_json [_offset] == '-') { if (hasExp) { if (sbExp.Length > 0) { @@ -56,5 +56,5 @@ } - sbExp.Append (json [offset]); + sbExp.Append (_json [_offset]); } else { if (sbNum.Length > 0) { @@ -62,7 +62,7 @@ } - sbNum.Append (json [offset]); + sbNum.Append (_json [_offset]); } - } else if (json [offset] == 'e' || json [offset] == 'E') { + } else if (_json [_offset] == 'e' || _json [_offset] == 'E') { if (hasExp) { throw new MalformedJSONException ("Multiple exponential markers in number found"); @@ -75,5 +75,5 @@ sbExp = new StringBuilder (); hasExp = true; - } else if (json [offset] == '+') { + } else if (_json [_offset] == '+') { if (hasExp) { if (sbExp.Length > 0) { @@ -81,5 +81,5 @@ } - sbExp.Append (json [offset]); + sbExp.Append (_json [_offset]); } else { throw new MalformedJSONException ("Positive sign in mantissa found"); @@ -104,5 +104,5 @@ } - offset++; + _offset++; } Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONObject.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONObject.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONObject.cs (revision 351) @@ -6,7 +6,7 @@ private readonly Dictionary nodes = new Dictionary (); - public JSONNode this [string name] { - get { return nodes [name]; } - set { nodes [name] = value; } + public JSONNode this [string _name] { + get { return nodes [_name]; } + set { nodes [_name] = value; } } @@ -19,66 +19,66 @@ } - public bool ContainsKey (string name) { - return nodes.ContainsKey (name); + public bool ContainsKey (string _name) { + return nodes.ContainsKey (_name); } - public void Add (string name, JSONNode node) { - nodes.Add (name, node); + public void Add (string _name, JSONNode _node) { + nodes.Add (_name, _node); } - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { - stringBuilder.Append ("{"); - if (prettyPrint) { - stringBuilder.Append ('\n'); + public override void ToString (StringBuilder _stringBuilder, bool _prettyPrint = false, int _currentLevel = 0) { + _stringBuilder.Append ("{"); + if (_prettyPrint) { + _stringBuilder.Append ('\n'); } foreach (KeyValuePair kvp in nodes) { - if (prettyPrint) { - stringBuilder.Append (new string ('\t', currentLevel + 1)); + if (_prettyPrint) { + _stringBuilder.Append (new string ('\t', _currentLevel + 1)); } - stringBuilder.Append (string.Format ("\"{0}\":", kvp.Key)); - if (prettyPrint) { - stringBuilder.Append (" "); + _stringBuilder.Append (string.Format ("\"{0}\":", kvp.Key)); + if (_prettyPrint) { + _stringBuilder.Append (" "); } - kvp.Value.ToString (stringBuilder, prettyPrint, currentLevel + 1); - stringBuilder.Append (","); - if (prettyPrint) { - stringBuilder.Append ('\n'); + kvp.Value.ToString (_stringBuilder, _prettyPrint, _currentLevel + 1); + _stringBuilder.Append (","); + if (_prettyPrint) { + _stringBuilder.Append ('\n'); } } if (nodes.Count > 0) { - stringBuilder.Remove (stringBuilder.Length - (prettyPrint ? 2 : 1), 1); + _stringBuilder.Remove (_stringBuilder.Length - (_prettyPrint ? 2 : 1), 1); } - if (prettyPrint) { - stringBuilder.Append (new string ('\t', currentLevel)); + if (_prettyPrint) { + _stringBuilder.Append (new string ('\t', _currentLevel)); } - stringBuilder.Append ("}"); + _stringBuilder.Append ("}"); } - public static JSONObject Parse (string json, ref int offset) { + public static JSONObject Parse (string _json, ref int _offset) { //Log.Out ("ParseObject enter (" + offset + ")"); JSONObject obj = new JSONObject (); bool nextElemAllowed = true; - offset++; + _offset++; while (true) { - Parser.SkipWhitespace (json, ref offset); - switch (json [offset]) { + Parser.SkipWhitespace (_json, ref _offset); + switch (_json [_offset]) { case '"': if (nextElemAllowed) { - JSONString key = JSONString.Parse (json, ref offset); - Parser.SkipWhitespace (json, ref offset); - if (json [offset] != ':') { + JSONString key = JSONString.Parse (_json, ref _offset); + Parser.SkipWhitespace (_json, ref _offset); + if (_json [_offset] != ':') { throw new MalformedJSONException ( "Could not parse object, missing colon (\":\") after key"); } - offset++; - JSONNode val = Parser.ParseInternal (json, ref offset); + _offset++; + JSONNode val = Parser.ParseInternal (_json, ref _offset); obj.Add (key.GetString (), val); nextElemAllowed = false; @@ -92,5 +92,5 @@ if (!nextElemAllowed) { nextElemAllowed = true; - offset++; + _offset++; } else { throw new MalformedJSONException ( @@ -100,5 +100,5 @@ break; case '}': - offset++; + _offset++; //Log.Out ("JSON:Parsed Object: " + obj.ToString ()); Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONString.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONString.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONString.cs (revision 351) @@ -5,6 +5,6 @@ private readonly string value; - public JSONString (string value) { - this.value = value; + public JSONString (string _value) { + value = _value; } @@ -13,7 +13,7 @@ } - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { + public override void ToString (StringBuilder _stringBuilder, bool _prettyPrint = false, int _currentLevel = 0) { if (value == null || value.Length == 0) { - stringBuilder.Append ("\"\""); + _stringBuilder.Append ("\"\""); return; } @@ -21,7 +21,7 @@ int len = value.Length; - stringBuilder.EnsureCapacity (stringBuilder.Length + 2 * len); + _stringBuilder.EnsureCapacity (_stringBuilder.Length + 2 * len); - stringBuilder.Append ('"'); + _stringBuilder.Append ('"'); foreach (char c in value) { @@ -31,28 +31,28 @@ // case '/': - stringBuilder.Append ('\\'); - stringBuilder.Append (c); + _stringBuilder.Append ('\\'); + _stringBuilder.Append (c); break; case '\b': - stringBuilder.Append ("\\b"); + _stringBuilder.Append ("\\b"); break; case '\t': - stringBuilder.Append ("\\t"); + _stringBuilder.Append ("\\t"); break; case '\n': - stringBuilder.Append ("\\n"); + _stringBuilder.Append ("\\n"); break; case '\f': - stringBuilder.Append ("\\f"); + _stringBuilder.Append ("\\f"); break; case '\r': - stringBuilder.Append ("\\r"); + _stringBuilder.Append ("\\r"); break; default: if (c < ' ') { - stringBuilder.Append ("\\u"); - stringBuilder.Append (((int) c).ToString ("X4")); + _stringBuilder.Append ("\\u"); + _stringBuilder.Append (((int) c).ToString ("X4")); } else { - stringBuilder.Append (c); + _stringBuilder.Append (c); } @@ -61,20 +61,20 @@ } - stringBuilder.Append ('"'); + _stringBuilder.Append ('"'); } - public static JSONString Parse (string json, ref int offset) { + public static JSONString Parse (string _json, ref int _offset) { //Log.Out ("ParseString enter (" + offset + ")"); StringBuilder sb = new StringBuilder (); - offset++; - while (offset < json.Length) { - switch (json [offset]) { + _offset++; + while (_offset < _json.Length) { + switch (_json [_offset]) { case '\\': - offset++; - switch (json [offset]) { + _offset++; + switch (_json [_offset]) { case '\\': case '"': case '/': - sb.Append (json [offset]); + sb.Append (_json [_offset]); break; case 'b': @@ -94,18 +94,18 @@ break; default: - sb.Append (json [offset]); + sb.Append (_json [_offset]); break; } - offset++; + _offset++; break; case '"': - offset++; + _offset++; //Log.Out ("JSON:Parsed String: " + sb.ToString ()); return new JSONString (sb.ToString ()); default: - sb.Append (json [offset]); - offset++; + sb.Append (_json [_offset]); + _offset++; break; } Index: binary-improvements/7dtd-server-fixes/src/JSON/MalformedJSONException.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/MalformedJSONException.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/JSON/MalformedJSONException.cs (revision 351) @@ -7,11 +7,11 @@ } - public MalformedJSONException (string message) : base (message) { + public MalformedJSONException (string _message) : base (_message) { } - public MalformedJSONException (string message, Exception inner) : base (message, inner) { + public MalformedJSONException (string _message, Exception _inner) : base (_message, _inner) { } - protected MalformedJSONException (SerializationInfo info, StreamingContext context) : base (info, context) { + protected MalformedJSONException (SerializationInfo _info, StreamingContext _context) : base (_info, _context) { } } Index: binary-improvements/7dtd-server-fixes/src/JSON/Parser.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/Parser.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/JSON/Parser.cs (revision 351) @@ -1,39 +1,39 @@ namespace AllocsFixes.JSON { public class Parser { - public static JSONNode Parse (string json) { + public static JSONNode Parse (string _json) { int offset = 0; - return ParseInternal (json, ref offset); + return ParseInternal (_json, ref offset); } - public static JSONNode ParseInternal (string json, ref int offset) { - SkipWhitespace (json, ref offset); + public static JSONNode ParseInternal (string _json, ref int _offset) { + SkipWhitespace (_json, ref _offset); //Log.Out ("ParseInternal (" + offset + "): Decide on: '" + json [offset] + "'"); - switch (json [offset]) { + switch (_json [_offset]) { case '[': - return JSONArray.Parse (json, ref offset); + return JSONArray.Parse (_json, ref _offset); case '{': - return JSONObject.Parse (json, ref offset); + return JSONObject.Parse (_json, ref _offset); case '"': - return JSONString.Parse (json, ref offset); + return JSONString.Parse (_json, ref _offset); case 't': case 'f': - return JSONBoolean.Parse (json, ref offset); + return JSONBoolean.Parse (_json, ref _offset); case 'n': - return JSONNull.Parse (json, ref offset); + return JSONNull.Parse (_json, ref _offset); default: - return JSONNumber.Parse (json, ref offset); + return JSONNumber.Parse (_json, ref _offset); } } - public static void SkipWhitespace (string json, ref int offset) { + public static void SkipWhitespace (string _json, ref int _offset) { //Log.Out ("SkipWhitespace (" + offset + "): '" + json [offset] + "'"); - while (offset < json.Length) { - switch (json [offset]) { + while (_offset < _json.Length) { + switch (_json [_offset]) { case ' ': case '\t': case '\r': case '\n': - offset++; + _offset++; break; default: Index: binary-improvements/7dtd-server-fixes/src/LandClaimList.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/LandClaimList.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/LandClaimList.cs (revision 351) @@ -5,7 +5,7 @@ namespace AllocsFixes { public class LandClaimList { - public delegate bool OwnerFilter (Player owner); + public delegate bool OwnerFilter (Player _owner); - public delegate bool PositionFilter (Vector3i position); + public delegate bool PositionFilter (Vector3i _position); public static Dictionary> GetLandClaims (OwnerFilter[] _ownerFilters, @@ -68,13 +68,13 @@ public static OwnerFilter SteamIdFilter (string _steamId) { - return p => p.SteamID.Equals (_steamId); + return _p => _p.SteamID.Equals (_steamId); } public static PositionFilter CloseToFilter2dRect (Vector3i _position, int _maxDistance) { - return v => Math.Abs (v.x - _position.x) <= _maxDistance && Math.Abs (v.z - _position.z) <= _maxDistance; + return _v => Math.Abs (_v.x - _position.x) <= _maxDistance && Math.Abs (_v.z - _position.z) <= _maxDistance; } public static OwnerFilter OrOwnerFilter (OwnerFilter _f1, OwnerFilter _f2) { - return p => _f1 (p) || _f2 (p); + return _p => _f1 (_p) || _f2 (_p); } } Index: binary-improvements/7dtd-server-fixes/src/PersistentData/InvItem.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/PersistentData/InvItem.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/PersistentData/InvItem.cs (revision 351) @@ -16,10 +16,10 @@ public int useTimes; - public InvItem (string itemName, int count, int quality, int maxUseTimes, int maxUse) { - this.itemName = itemName; - this.count = count; - this.quality = quality; - this.maxUseTimes = maxUseTimes; - this.useTimes = maxUse; + public InvItem (string _itemName, int _count, int _quality, int _maxUseTimes, int _maxUse) { + itemName = _itemName; + count = _count; + quality = _quality; + maxUseTimes = _maxUseTimes; + useTimes = _maxUse; } } Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs (revision 351) @@ -15,29 +15,29 @@ } - public void Update (PlayerDataFile pdf) { + public void Update (PlayerDataFile _pdf) { lock (this) { //Log.Out ("Updating player inventory - player id: " + pdf.id); - ProcessInv (bag, pdf.bag, pdf.id); - ProcessInv (belt, pdf.inventory, pdf.id); - ProcessEqu (pdf.equipment, pdf.id); + ProcessInv (bag, _pdf.bag, _pdf.id); + ProcessInv (belt, _pdf.inventory, _pdf.id); + ProcessEqu (_pdf.equipment, _pdf.id); } } - private void ProcessInv (List target, ItemStack[] sourceFields, int id) { - target.Clear (); - for (int i = 0; i < sourceFields.Length; i++) { - InvItem item = CreateInvItem (sourceFields [i].itemValue, sourceFields [i].count, id); - if (item != null && sourceFields [i].itemValue.Modifications != null) { - ProcessParts (sourceFields [i].itemValue.Modifications, item, id); + private void ProcessInv (List _target, ItemStack[] _sourceFields, int _id) { + _target.Clear (); + for (int i = 0; i < _sourceFields.Length; i++) { + InvItem item = CreateInvItem (_sourceFields [i].itemValue, _sourceFields [i].count, _id); + if (item != null && _sourceFields [i].itemValue.Modifications != null) { + ProcessParts (_sourceFields [i].itemValue.Modifications, item, _id); } - target.Add (item); + _target.Add (item); } } - private void ProcessEqu (Equipment sourceEquipment, int _playerId) { - equipment = new InvItem[sourceEquipment.GetSlotCount ()]; - for (int i = 0; i < sourceEquipment.GetSlotCount (); i++) { - equipment [i] = CreateInvItem (sourceEquipment.GetSlotItem (i), 1, _playerId); + private void ProcessEqu (Equipment _sourceEquipment, int _playerId) { + equipment = new InvItem[_sourceEquipment.GetSlotCount ()]; + for (int i = 0; i < _sourceEquipment.GetSlotCount (); i++) { + equipment [i] = CreateInvItem (_sourceEquipment.GetSlotItem (i), 1, _playerId); } } Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs (revision 351) @@ -168,6 +168,6 @@ } - public Player (string steamId) { - this.steamId = steamId; + public Player (string _steamId) { + steamId = _steamId; inventory = new Inventory (); } @@ -193,10 +193,10 @@ } - public void SetOnline (ClientInfo ci) { + public void SetOnline (ClientInfo _ci) { Log.Out ("Player set to online: " + steamId); - clientInfo = ci; - entityId = ci.entityId; - name = ci.playerName; - ip = ci.ip; + clientInfo = _ci; + entityId = _ci.entityId; + name = _ci.playerName; + ip = _ci.ip; lastOnline = DateTime.Now; } Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs (revision 346) +++ binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs (revision 351) @@ -8,21 +8,21 @@ public readonly Dictionary Dict = new Dictionary (StringComparer.OrdinalIgnoreCase); - public Player this [string steamId, bool create] { + public Player this [string _steamId, bool _create] { get { - if (string.IsNullOrEmpty (steamId)) { + if (string.IsNullOrEmpty (_steamId)) { return null; } - if (Dict.ContainsKey (steamId)) { - return Dict [steamId]; + if (Dict.ContainsKey (_steamId)) { + return Dict [_steamId]; } - if (!create || steamId.Length != 17) { + if (!_create || _steamId.Length != 17) { return null; } - Log.Out ("Created new player entry for ID: " + steamId); - Player p = new Player (steamId); - Dict.Add (steamId, p); + Log.Out ("Created new player entry for ID: " + _steamId); + Player p = new Player (_steamId); + Dict.Add (_steamId, p); return p; }