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

inv_col: fix ground items stacking with veh items #56777

Merged
merged 1 commit into from
Apr 19, 2022
Merged

inv_col: fix ground items stacking with veh items #56777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/inventory_ui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,8 @@ void inventory_column::add_entry( const inventory_entry &entry )
}
item_location found_entry_item = entry.locations.front();
// this would be much simpler if item::parent_item() didn't call debugmsg
return entry_item.position() == found_entry_item.position() and
return entry_item.where() == found_entry_item.where() and
entry_item.position() == found_entry_item.position() and
( ( !entry_item.has_parent() and !found_entry_item.has_parent() ) ||
( entry_item.has_parent() and found_entry_item.has_parent() and
entry_item.parent_item() == found_entry_item.parent_item() ) ) and
Expand Down