Changeset 351 for binary-improvements/7dtd-server-fixes/src/PersistentData

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)

Location:

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

Files:

• InvItem.cs (modified) (1 diff)
• Inventory.cs (modified) (1 diff)
• Player.cs (modified) (2 diffs)
• Players.cs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/src/PersistentData/InvItem.cs

@@ -16 +16 @@
                 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;
                 }
         }

binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs

@@ -15 +15 @@
                 }
 
-                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<InvItem> 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<InvItem> _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);
                         }
                 }

binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs

@@ -168 +168 @@
                 }
 
-                public Player (string steamId) {
-                        this.steamId = steamId;
+                public Player (string _steamId) {
+                        steamId = _steamId;
                         inventory = new Inventory ();
                 }
@@ -193 +193 @@
                 }
 
-                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;
                 }

binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs

@@ -8 +8 @@
                 public readonly Dictionary<string, Player> Dict = new Dictionary<string, Player> (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;
                         }