Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix "resin_cord is undefed" #33504

Merged
merged 2 commits into from
Aug 24, 2019
Merged

Fix "resin_cord is undefed" #33504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e688c1
Make repair_actions non-static.
BevapDin Aug 24, 2019
1212974
Also clear Item_factory::misc_tools
BevapDin Aug 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/item_factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ struct tripoint;
using t_string_set = std::set<std::string>;
static t_string_set item_blacklist;

static std::set<std::string> repair_actions;

static DynamicDataLoader::deferred_json deferred;

std::unique_ptr<Item_factory> item_controller = std::make_unique<Item_factory>();
Expand Down Expand Up @@ -2335,6 +2333,8 @@ void Item_factory::clear()

repair_tools.clear();
gun_tools.clear();
misc_tools.clear();
repair_actions.clear();

frozen = false;
}
Expand Down
2 changes: 2 additions & 0 deletions src/item_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,8 @@ class Item_factory

// tools that can be used to repair wood/paper/bone/chitin items
std::set<itype_id> misc_tools;

std::set<std::string> repair_actions;
};

#endif