From c9a5e50a1cf66718191a8511381e08397d95d28b Mon Sep 17 00:00:00 2001
From: Collin Smith <collinsmith70@gmail.com>
Date: Mon, 6 Jan 2020 01:35:05 -0800
Subject: [PATCH] Renamed charClass to classId

---
 core/src/com/riiablo/CharData.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/com/riiablo/CharData.java b/core/src/com/riiablo/CharData.java
index 2b2b99ef..0436e5ba 100644
--- a/core/src/com/riiablo/CharData.java
+++ b/core/src/com/riiablo/CharData.java
@@ -25,7 +25,7 @@ import static com.riiablo.item.StoreLoc.INVENTORY;
 
 public class CharData {
   private D2S d2s;
-  private CharacterClass charClass;
+  private CharacterClass classId;
   private Item cursor;
   private final EnumMap<StoreLoc, Array<Item>> store = new EnumMap<>(StoreLoc.class);
   private final EnumMap<BodyLoc, Item> equipped = new EnumMap<>(BodyLoc.class);
@@ -71,7 +71,7 @@ public class CharData {
   public CharData setD2S(D2S d2s) {
     if (this.d2s != d2s) {
       this.d2s = d2s;
-      charClass = CharacterClass.get(d2s.header.charClass);
+      classId = CharacterClass.get(d2s.header.charClass);
     }
 
     return this;
@@ -181,14 +181,14 @@ public class CharData {
     skills.clear();
     chargedSkills.clear();
     skills.putAll(defaultSkills);
-    for (int spellId = charClass.firstSpell, i = 0; spellId < charClass.lastSpell; spellId++, i++) {
+    for (int spellId = classId.firstSpell, i = 0; spellId < classId.lastSpell; spellId++, i++) {
       skills.put(spellId, d2s.skills.data[i]);
     }
     notifySkillsChanged(skills, chargedSkills);
   }
 
   public CharacterClass getCharacterClass() {
-    return charClass;
+    return classId;
   }
 
   public void loadItems() {
@@ -244,7 +244,7 @@ public class CharData {
     if ((LARM != null && LARM.typeEntry.Throwable)
      || (RARM != null && RARM.typeEntry.Throwable)) {
       skills.put(throw_, 1);
-      if (charClass == CharacterClass.BARBARIAN) {
+      if (classId == CharacterClass.BARBARIAN) {
         skills.put(left_hand_throw, 1);
       }
     }
@@ -263,7 +263,7 @@ public class CharData {
       }
     }
 
-    for (int spellId = charClass.firstSpell, i = 0; spellId < charClass.lastSpell; spellId++, i++) {
+    for (int spellId = classId.firstSpell, i = 0; spellId < classId.lastSpell; spellId++, i++) {
       skills.put(spellId, d2s.skills.data[i]);
     }