diff --git a/src/game.cpp b/src/game.cpp index 1dde8f11c515e..7a594da43ca3c 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -6639,6 +6639,14 @@ look_around_result game::look_around( catacurses::window w_info, tripoint ¢e int la_y = 0; int la_x = TERMX - panel_width; + std::string position = get_option( "LOOKAROUND_POSITION" ); + if( position == "left" ) { + if( get_option( "SIDEBAR_POSITION" ) == "right" ) { + la_x = panel_manager::get_manager().get_width_left(); + } else { + la_x = panel_manager::get_manager().get_width_left() - panel_width; + } + } int la_h = height; int la_w = panel_width; w_info = catacurses::newwin( la_h, la_w, point( la_x, la_y ) ); @@ -6774,7 +6782,16 @@ look_around_result game::look_around( catacurses::window w_info, tripoint ¢e int panel_width = panel_manager::get_manager().get_current_layout().begin()->get_width(); int height = pixel_minimap_option ? TERMY - getmaxy( w_pixel_minimap ) : TERMY; - w_info = catacurses::newwin( height, panel_width, point( TERMX - panel_width, 0 ) ); + int la_x = TERMX - panel_width; + std::string position = get_option( "LOOKAROUND_POSITION" ); + if( position == "left" ) { + if( get_option( "SIDEBAR_POSITION" ) == "right" ) { + la_x = panel_manager::get_manager().get_width_left(); + } else { + la_x = panel_manager::get_manager().get_width_left() - panel_width; + } + } + w_info = catacurses::newwin( height, panel_width, point( la_x, 0 ) ); } else if( action == "LEVEL_UP" || action == "LEVEL_DOWN" ) { if( !allow_zlev_move ) { continue; diff --git a/src/options.cpp b/src/options.cpp index 765a725da0abc..353d346160642 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -1520,6 +1520,12 @@ void options_manager::add_options_interface() false ); + add( "LOOKAROUND_POSITION", "interface", translate_marker( "Look around position" ), + translate_marker( "Switch between look around panel being left or right." ), + { { "left", translate_marker( "Left" ) }, { "right", translate_marker( "Right" ) } }, + "right" + ); + add( "PICKUP_POSITION", "interface", translate_marker( "Pickup position" ), translate_marker( "Switch between pickup panel being left, right, or overlapping the sidebar." ), { { "left", translate_marker( "Left" ) }, { "right", translate_marker( "Right" ) }, { "overlapping", translate_marker( "Overlapping" ) } },