Skip to content

Add casts and widen a variable to make MSVC happy #60568

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

Merged
dseguin merged 1 commit into from
Sep 1, 2022
Merged

Add casts and widen a variable to make MSVC happy #60568

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/condition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,7 +1789,7 @@ std::function<int( const T & )> conditional_t<T>::get_get_int( const JsonObject
}
return false;
} );
return targets.size();
return static_cast<int>( targets.size() );
};
}
} else if( jo.has_member( "moon" ) ) {
Expand Down
6 changes: 3 additions & 3 deletions src/npctrade.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ struct faction_price_rule;
class item_pricing
{
public:
item_pricing( Character &c, item &it, int v, int count ) : loc( c, &it ), price( v ) {
item_pricing( Character &c, item &it, double v, int count ) : loc( c, &it ), price( v ) {
set_values( count );
}

item_pricing( item_location &&l, int v, int count ) : loc( std::move( l ) ), price( v ) {
item_pricing( item_location &&l, double v, int count ) : loc( std::move( l ) ), price( v ) {
set_values( count );
}
void set_values( int ip_count );

item_location loc;
int price = 0;
double price = 0;
// Whether this is selected for trading
bool selected = false;
bool is_container = false;
Expand Down
25 changes: 15 additions & 10 deletions src/worldfactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ WORLD *worldfactory::pick_world( bool show_prompt, bool empty_only )
const bool sel_this = static_cast<int>( i ) == sel;
inclusive_rectangle<point> btn( world_list_top_left + point( 4, i ),
world_list_top_left + point( world_list_width - 1, i ) );
button_map.emplace( i, btn );
button_map.emplace( static_cast<int>( i ), btn );

mvwprintz( w_worlds, point( 0, static_cast<int>( i ) ), c_white, "%d", i + 1 );
wmove( w_worlds, point( 4, static_cast<int>( i ) ) );
Expand Down Expand Up @@ -868,7 +868,7 @@ std::map<int, inclusive_rectangle<point>> worldfactory::draw_mod_list( const cat
}
mod_entry_name += string_format( _( " [%s]" ), mod_entry_id.str() );
trim_and_print( w, point( 4, iNum - start ), wwidth, mod_entry_color, mod_entry_name );
ent_map.emplace( std::distance( mods.begin(), iter ),
ent_map.emplace( static_cast<int>( std::distance( mods.begin(), iter ) ),
inclusive_rectangle<point>( point( 1, iNum - start ), point( 3 + wwidth, iNum - start ) ) );

if( w_shift ) {
Expand Down Expand Up @@ -1283,7 +1283,8 @@ int worldfactory::show_worldgen_tab_modselection( const catacurses::window &win,
wputch( win, BORDER_COLOR, LINE_OXOX );
point tabpos( point( 2 + ++xpos, 4 ) );
int tabwidth = utf8_width( get_mod_list_tabs()[i].second.translated(), true );
mod_tab_map.emplace( i, inclusive_rectangle<point>( tabpos, tabpos + point( tabwidth, 0 ) ) );
mod_tab_map.emplace( static_cast<int>( i ),
inclusive_rectangle<point>( tabpos, tabpos + point( tabwidth, 0 ) ) );
xpos += tabwidth + 2;
}

Expand Down Expand Up @@ -1734,7 +1735,7 @@ int worldfactory::show_worldgen_basic( WORLD *world )
colorize( "][", acc_clr ), _( "Finish" ), colorize( "]", acc_clr ) );
const point finish_pos( win_width / 4 - utf8_width( btn_txt, true ) / 2, y );
print_colored_text( w_confirmation, finish_pos, base_clr, base_clr, btn_txt );
btn_map.emplace( wg_sliders.size() + 1,
btn_map.emplace( static_cast<int>( wg_sliders.size() + 1 ),
inclusive_rectangle<point>( finish_pos, finish_pos + point( utf8_width( btn_txt, true ), 0 ) ) );
// Reset button
acc_clr = get_clr( c_yellow, sel_opt == static_cast<int>( wg_sliders.size() + 2 ) );
Expand All @@ -1745,7 +1746,7 @@ int worldfactory::show_worldgen_basic( WORLD *world )
colorize( "][", acc_clr ), _( "Reset" ), colorize( "]", acc_clr ) );
const point reset_pos( win_width / 2 - utf8_width( btn_txt, true ) / 2, y );
print_colored_text( w_confirmation, reset_pos, base_clr, base_clr, btn_txt );
btn_map.emplace( wg_sliders.size() + 2,
btn_map.emplace( static_cast<int>( wg_sliders.size() + 2 ),
inclusive_rectangle<point>( reset_pos, reset_pos + point( utf8_width( btn_txt, true ), 0 ) ) );
// Randomize button
acc_clr = get_clr( c_yellow, sel_opt == static_cast<int>( wg_sliders.size() + 3 ) );
Expand All @@ -1756,7 +1757,7 @@ int worldfactory::show_worldgen_basic( WORLD *world )
colorize( "][", acc_clr ), _( "Randomize" ), colorize( "]", acc_clr ) );
const point rand_pos( ( win_width * 3 ) / 4 - utf8_width( btn_txt, true ) / 2, y++ );
print_colored_text( w_confirmation, rand_pos, base_clr, base_clr, btn_txt );
btn_map.emplace( wg_sliders.size() + 3,
btn_map.emplace( static_cast<int>( wg_sliders.size() + 3 ),
inclusive_rectangle<point>( rand_pos, rand_pos + point( utf8_width( btn_txt, true ), 0 ) ) );
}

Expand Down Expand Up @@ -1797,13 +1798,17 @@ int worldfactory::show_worldgen_basic( WORLD *world )
ctxt.get_desc( "ADVANCED_SETTINGS", 1U ) );
mvwprintz( w_confirmation, point( 2, win_height - 4 ), c_light_gray, _( "Advanced settings:" ) );
print_colored_text( w_confirmation, point( 2, win_height - 3 ), dummy, c_light_gray, sctxt );
btn_map.emplace( wg_sliders.size() + 4, inclusive_rectangle<point>( point( 2, win_height - 3 ),
point( 2 + utf8_width( sctxt, true ), win_height - 3 ) ) );
btn_map.emplace( static_cast<int>( wg_sliders.size() + 4 ),
inclusive_rectangle<point>(
point( 2, win_height - 3 ),
point( 2 + utf8_width( sctxt, true ), win_height - 3 ) ) );
sctxt = string_format( _( "[<color_yellow>%s</color>] - Open mod manager" ),
ctxt.get_desc( "PICK_MODS", 1U ) );
print_colored_text( w_confirmation, point( 2, win_height - 2 ), dummy, c_light_gray, sctxt );
btn_map.emplace( wg_sliders.size() + 5, inclusive_rectangle<point>( point( 2, win_height - 2 ),
point( 2 + utf8_width( sctxt, true ), win_height - 2 ) ) );
btn_map.emplace( static_cast<int>( wg_sliders.size() + 5 ),
inclusive_rectangle<point>(
point( 2, win_height - 2 ),
point( 2 + utf8_width( sctxt, true ), win_height - 2 ) ) );
wnoutrefresh( w_confirmation );
} );

Expand Down