Check items against exclude rules if AUTO_PICKUP_ZERO is enabled.

desrik · Jul 8, 2014 · 4aee442 · 4aee442
1 parent aef9543
commit 4aee442
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/auto_pickup.cpp b/src/auto_pickup.cpp
@@ -644,6 +644,19 @@ void createPickupRules(const std::string sItemNameIn)
     }
 }
 
+bool checkExcludeRules(const std::string sItemNameIn)
+{
+    for (std::vector<cPickupRules>::iterator pattern_it = vAutoPickupRules[APU_MERGED].begin();
+         pattern_it != vAutoPickupRules[APU_MERGED].end(); ++pattern_it) {
+        if (pattern_it->bExclude && pattern_it->bActive &&
+            auto_pickup_match(sItemNameIn, pattern_it->sRule)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 void save_reset_changes(bool bReset)
 {
     for (int i = APU_GLOBAL; i <= APU_CHARACTER; i++) { //Loop through global 1 and character 2

diff --git a/src/auto_pickup.h b/src/auto_pickup.h
@@ -45,6 +45,7 @@ bool hasPickupRule(std::string sRule);
 void addPickupRule(std::string sRule);
 void removePickupRule(std::string sRule);
 void createPickupRules(const std::string sItemNameIn = "");
+bool checkExcludeRules(const std::string sItemNameIn);
 void save_reset_changes(bool bReset);
 void show_auto_pickup();
 void load_auto_pickup(bool bCharacter);

diff --git a/src/pickup.cpp b/src/pickup.cpp
@@ -388,7 +388,8 @@ void Pickup::pick_up(int posx, int posy, int min)
                     //Auto Pickup all items with 0 Volume and Weight <= AUTO_PICKUP_ZERO * 50
                     if (OPTIONS["AUTO_PICKUP_ZERO"]) {
                         if (here[i].volume() == 0 &&
-                            here[i].weight() <= OPTIONS["AUTO_PICKUP_ZERO"] * 50) {
+                            here[i].weight() <= OPTIONS["AUTO_PICKUP_ZERO"] * 50 &&
+                            checkExcludeRules(here[i].tname())) {
                             bPickup = true;
                         }
                     }