@@ -552,9 +552,6 @@ void item_contents::force_insert_item( const item &it, item_pocket::pocket_type
552
552
std::pair<item_location, item_pocket *> item_contents::best_pocket ( const item &it,
553
553
item_location &parent, const item *avoid, const bool allow_sealed, const bool ignore_settings )
554
554
{
555
- if ( !can_contain ( it ).success () ) {
556
- return { item_location (), nullptr };
557
- }
558
555
std::pair<item_location, item_pocket *> ret;
559
556
ret.second = nullptr ;
560
557
for ( item_pocket &pocket : contents ) {
@@ -1191,8 +1188,7 @@ std::list<item *> item_contents::all_items_top( const std::function<bool( item_p
1191
1188
for ( item_pocket &pocket : contents ) {
1192
1189
if ( filter ( pocket ) ) {
1193
1190
std::list<item *> contained_items = pocket.all_items_top ();
1194
- all_items_internal.insert ( all_items_internal.end (), contained_items.begin (),
1195
- contained_items.end () );
1191
+ all_items_internal.splice ( all_items_internal.end (), std::move ( contained_items ) );
1196
1192
}
1197
1193
}
1198
1194
return all_items_internal;
@@ -1219,8 +1215,7 @@ std::list<const item *> item_contents::all_items_top( const
1219
1215
for ( const item_pocket &pocket : contents ) {
1220
1216
if ( filter ( pocket ) ) {
1221
1217
std::list<const item *> contained_items = pocket.all_items_top ();
1222
- all_items_internal.insert ( all_items_internal.end (), contained_items.begin (),
1223
- contained_items.end () );
1218
+ all_items_internal.splice ( all_items_internal.end (), std::move ( contained_items ) );
1224
1219
}
1225
1220
}
1226
1221
return all_items_internal;
0 commit comments