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

Extended pickup window #36492

Merged
merged 12 commits into from
Dec 31, 2019
Merged

Extended pickup window #36492

Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e3bb1b3
Merge pull request #1 from CleverRaven/master
8street Dec 7, 2019
b5d17e9
Merge pull request #2 from CleverRaven/master
8street Dec 14, 2019
df84d2a
Merge branch 'master' of https://github.com/8street/Cataclysm-DDA
8street Dec 27, 2019
1d1a8ca
Editing pickup.cpp
8street Dec 27, 2019
9084e76
Editing pickup.cpp 2
8street Dec 27, 2019
cf23218
Editing pickup.cpp 3
8street Dec 27, 2019
20d0082
Editing pickup.cpp 4
8street Dec 27, 2019
3c537f6
Astyle check
8street Dec 27, 2019
38cfcd0
Astyle check 2
8street Dec 27, 2019
2a108e9
Editing pickup.cpp 5
8street Dec 27, 2019
8ced1f5
Editing pickup.cpp 6
8street Dec 28, 2019
3990210
Merge pull request #4 from CleverRaven/master
8street Dec 30, 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
9 changes: 9 additions & 0 deletions src/pickup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,15 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from )
int pickupH = maxitems + pickupBorderRows;
int pickupW = 44;

//find max length of item name and resize pickup window width
for( size_t cur_it = 0; cur_it < stacked_here.size(); cur_it++ ) {
const item &this_item = *stacked_here[cur_it].front();
Copy link
Contributor

@Qrox Qrox Dec 28, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cur_it in your code is only used to access the elements of stacked_here, so it can be simplified to a range-based for loop. You only need to change

        for( size_t cur_it = 0; cur_it < stacked_here.size(); cur_it++ ) {
            const item &this_item = *stacked_here[cur_it].front();

to

        for( const std::list<item_stack::iterator> &cur_list : stacked_here ) {
            const item &this_item = *cur_list.front();

int item_len = utf8_width( remove_color_tags( this_item.display_name() ) ) + 10;
if( item_len > pickupW && item_len < TERMX ) {
pickupW = item_len;
}
}

int itemsW = pickupW;

int pickupX = 0;
Expand Down