Debug menu fixes #21053
Merged
Debug menu fixes #21053
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BevapDin
suggested changes
May 21, 2017
src/wish.cpp
Outdated
| @@ -170,7 +170,9 @@ class wish_mutate_callback: public uimenu_callback | |||
|
|
|||
| mvwprintz( menu->window, menu->w_height - 3, startx, c_green, "%s", msg.c_str() ); | |||
| msg = padding; | |||
| mvwprintw( menu->window, menu->w_height - 2, startx, _( "[/] find, [q]uit" ) ); | |||
| input_context ctxt( "UIMENU" ); | |||
| mvwprintw( menu->window, menu->w_height - 2, startx, string_format( _( "[%s] find, [%s] quit" ), | |||
There was a problem hiding this comment.
mvwprintw does formatting, no need to invoke string_format. Actually, this can cause trouble if the formatted string contains a '%', which is interpreted by mvwprintw and expects another (missing) argument.
src/wish.cpp
Outdated
| mvwprintw( w_info, getmaxy( w_info ) - 2, 0, | ||
| _( "[/] find, [f]riendly, [h]allucination, [i]ncrease group, [d]ecrease group, [q]uit" ) ); | ||
| string_format( |
There was a problem hiding this comment.
Same problem here: mvwprintw does formatting on its own.
src/wish.cpp
Outdated
| mvwprintw( menu->window, menu->w_height - 2, startx, _( "[/] find, [f] container, [q]uit" ) ); | ||
| input_context ctxt( "UIMENU" ); | ||
| mvwprintw( menu->window, menu->w_height - 2, startx, | ||
| string_format( _( "[%s] find, [f] container, [%s] quit" ), |
src/wish.cpp
Outdated
| @@ -476,36 +485,42 @@ void debug_menu::wishitem( player *p, int x, int y, int z ) | |||
| wmenu.query(); | |||
| if( wmenu.ret >= 0 ) { | |||
| item granted( opts[wmenu.ret] ); | |||
| if( dynamic_cast<wish_item_callback *>( wmenu.callback )->incontainer ) { | |||
There was a problem hiding this comment.
Why don't you use the callback object cb directly? That way you won't need the dynamic_cast.
There was a problem hiding this comment.
Well, I actually moved these code here from a latter place. I'll see if I can improve it.
|
This will fix 2 of 3 remaining items in #17889. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes several issues with regard to the debug menu: