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 extended pickup window #36593

Merged
merged 11 commits into from
Jan 2, 2020
Merged

Fix extended pickup window #36593

Changes from 8 commits
Commits
Show all changes
11 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
5c83410
Merge pull request #3 from CleverRaven/master
8street Dec 30, 2019
22e5b89
Merge pull request #5 from CleverRaven/master
8street Dec 31, 2019
8940ae2
Editing pickup.cpp
8street Dec 31, 2019
a147ec2
Editing pickup.cpp 2
8street Dec 31, 2019
32bc0f0
Update src/pickup.cpp
8street Dec 31, 2019
c8f5754
Editing pickup.cpp 3
8street Jan 1, 2020
70a162e
Editing pickup.cpp
8street Jan 1, 2020
c5eafd5
Merge pull request #6 from CleverRaven/master
8street Jan 1, 2020
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
13 changes: 10 additions & 3 deletions src/pickup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,11 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from )
int selected = 0;
int iScrollPos = 0;

std::string clear_buffer;
8street marked this conversation as resolved.
Show resolved Hide resolved
for( int cur_column = 0; cur_column <= pickupW; cur_column += 10 ) {
clear_buffer += " ";
}

std::string filter;
std::string new_filter;
// Indexes of items that match the filter
Expand All @@ -636,10 +641,12 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from )
const std::string pickup_chars =
ctxt.get_available_single_char_hotkeys( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ:;" );
int idx = -1;
for( int i = 1; i < pickupH; i++ ) {
mvwprintw( w_pickup, point( 0, i ),
" " );

//clear all items names
for( int cur_row = 1; cur_row < pickupH; cur_row++ ) {
mvwprintw( w_pickup, point( 0, cur_row ), clear_buffer );
}

if( action == "ANY_INPUT" &&
raw_input_char >= '0' && raw_input_char <= '9' ) {
int raw_input_char_value = static_cast<char>( raw_input_char ) - '0';
Expand Down