Merge pull request #3957 from ave-/fix_infinite_batterymod_etc_items

fixed non-disappearing on use roadmap and extra battery mod

iuse.cpp

@@ -1270,7 +1270,7 @@ int iuse::extra_battery(game *g, player *p, item *it, bool t)
 
     modded->item_tags.insert("DOUBLE_AMMO");
     g->add_msg_if_player(p,_("You double the battery capacity of your %s!"), tool->name.c_str());
-    return it->type->charges_to_use();
+    return 1;
 }
 
 static bool valid_fabric(game *g, player *p, item *it, bool t)
@@ -2131,7 +2131,7 @@ int iuse::roadmap(game *g, player *p, item *it, bool t)
 
  g->add_msg_if_player(p, _("You add roads and points of interest to your map."));
 
- return it->type->charges_to_use();
+ return 1;
 }
 
 int iuse::picklock(game *g, player *p, item *it, bool t)