Merge pull request #127 from Avalancs/itemOverflowErrorFix

Item overflow error fix

Author: vampcat

main/src/org/destinationsol/game/item/ItemContainer.java

@@ -22,12 +22,12 @@
 import java.util.*;
 
 public class ItemContainer implements Iterable<List<SolItem>> {
-  public static final int MAX_GROUP_COUNT = 4 * Const.ITEM_GROUPS_PER_PAGE;
-  public static final int MAX_GROUP_SZ = 30;
+  public static final int MAX_INVENTORY_PAGES = 4;
+  public static final int MAX_GROUP_COUNT = MAX_INVENTORY_PAGES * Const.ITEM_GROUPS_PER_PAGE;
+  public static final int MAX_STACK_SIZE = 30; // e.g.: ammo, repair kit
 
   private List<List<SolItem>> myGroups;
   private Set<List<SolItem>> myNewGroups;
-  private int mySize;
 
   public ItemContainer() {
     myGroups = new ArrayList<List<SolItem>>();
@@ -58,7 +58,7 @@ public boolean canAdd(SolItem example) {
     for (int i = 0, myGroupsSize = myGroups.size(); i < myGroupsSize; i++) {
       List<SolItem> group = myGroups.get(i);
       SolItem item = group.get(0);
-      if (item.isSame(example)) return group.size() < MAX_GROUP_SZ;
+      if (item.isSame(example)) return group.size() < MAX_STACK_SIZE;
     }
     return myGroups.size() < MAX_GROUP_COUNT;
   }
@@ -69,20 +69,17 @@ public void add(SolItem addedItem) {
       List<SolItem> group = myGroups.get(i);
       SolItem item = group.get(0);
       if (item.isSame(addedItem)) {
-        if ((group.size() < MAX_GROUP_SZ))
-        {
+        if ((group.size() < MAX_STACK_SIZE)) {
         	group.add(addedItem);
-        	mySize++;
         }
         return;
-        
       }
     }
-    if (myGroups.size() >= MAX_GROUP_COUNT) throw new AssertionError("reached group count limit");
-    ArrayList<SolItem> group = new ArrayList<SolItem>();
+    // From now on, silently ignore if by some chance an extra inventory page is created
+    //if (myGroups.size() >= MAX_GROUP_COUNT) throw new AssertionError("reached group count limit");
+    ArrayList<SolItem> group = new ArrayList<>();
     group.add(addedItem);
     myGroups.add(0, group);
-    mySize++;
     myNewGroups.add(group);
   }
 
@@ -95,10 +92,6 @@ public int groupCount() {
     return myGroups.size();
   }
 
-  public int size() {
-    return mySize;
-  }
-
   public boolean contains(SolItem item) {
     for (int i = 0, myGroupsSize = myGroups.size(); i < myGroupsSize; i++) {
       List<SolItem> group = myGroups.get(i);
@@ -116,7 +109,6 @@ public void remove(SolItem item) {
       if (group.isEmpty()) remGroup = group;
       if (removed) break;
     }
-    if (removed) mySize--;
     if (remGroup != null) {
       myGroups.remove(remGroup);
       myNewGroups.remove(remGroup);
@@ -165,7 +157,6 @@ public List<SolItem> getGroup(int groupIdx) {
   public void clear() {
     myGroups.clear();
     myNewGroups.clear();
-    mySize = 0;
   }
 
   private class Itr implements Iterator<List<SolItem>> {