Skip to content

Commit

Permalink
Bring back smiley while driving (#27775)
Browse files Browse the repository at this point in the history
Bring back mood smiley while driving
  • Loading branch information
nsklaus authored and ZhilkinSerg committed Jan 22, 2019
1 parent 7151c04 commit 911f310
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/sidebar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -457,12 +457,11 @@ void player::disp_status( const catacurses::window &w, const catacurses::window
fc = face_bird;
}

// don't display mood while driving,
if( !in_vehicle ) {
mvwprintz( w, sideStyle ? 6 : 3, sideStyle ? getmaxx( w ) - 2 : 0, col_morale,
morale_emotion( morale_cur, fc,
get_option<std::string>( "MORALE_STYLE" ) == "horizontal" ) );
}
// display mood smiley
mvwprintz( w, sideStyle ? 6 : 3, sideStyle ? getmaxx( w ) - 2 : 0, col_morale,
morale_emotion( morale_cur, fc,
get_option<std::string>( "MORALE_STYLE" ) == "horizontal" ) );

vehicle *veh = g->remoteveh();
if( veh == nullptr && in_vehicle ) {
veh = veh_pointer_or_null( g->m.veh_at( pos() ) );
Expand Down

0 comments on commit 911f310

Please sign in to comment.