@ -842,6 +842,7 @@ enum SelectCompanyManagerFaceWidgets {
SCMFW_WIDGET_GLASSES_L ,
SCMFW_WIDGET_GLASSES ,
SCMFW_WIDGET_GLASSES_R ,
SCMFW_WIDGET_LABELS ,
} ;
static const NWidgetPart _nested_select_company_manager_face_widgets [ ] = {
@ -930,7 +931,7 @@ static const NWidgetPart _nested_select_company_manager_face_adv_widgets[] = {
EndContainer ( ) ,
NWidget ( NWID_SPACER ) , SetMinimalSize ( 0 , 2 ) ,
NWidget ( NWID_HORIZONTAL ) ,
NWidget ( NWID_SPACER) , SetMinimalSize ( 80 , 0 ) ,
NWidget ( WWT_EMPTY, COLOUR_GREY , SCMFW_WIDGET_LABELS ) , SetMinimalSize ( 75 , 146 ) , SetPadding ( 0 , 4 , 0 , 1 ) ,
NWidget ( NWID_VERTICAL ) ,
NWidget ( WWT_PUSHTXTBTN , COLOUR_GREY , SCMFW_WIDGET_HAS_MOUSTACHE_EARRING ) , SetMinimalSize ( 43 , 12 ) , SetDataTip ( STR_EMPTY , STR_FACE_MOUSTACHE_EARRING_TIP ) ,
NWidget ( WWT_PUSHTXTBTN , COLOUR_GREY , SCMFW_WIDGET_HAS_GLASSES ) , SetMinimalSize ( 43 , 12 ) , SetDataTip ( STR_EMPTY , STR_FACE_GLASSES_TIP ) ,
@ -1017,36 +1018,37 @@ static const Widget _select_company_manager_face_adv_widgets[] = {
{ WWT_TEXTBTN , RESIZE_NONE , COLOUR_GREY , 157 , 217 , 46 , 57 , STR_FACE_AFRICAN , STR_FACE_SELECT_AFRICAN } , // SCMFW_WIDGET_ETHNICITY_AFR
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 175 , 217 , 60 , 71 , STR_EMPTY , STR_FACE_MOUSTACHE_EARRING_TIP } , // SCMFW_WIDGET_HAS_MOUSTACHE_EARRING
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 175 , 217 , 72 , 83 , STR_EMPTY , STR_FACE_GLASSES_TIP } , // SCMFW_WIDGET_HAS_GLASSES
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 110 , 121 , SPR_ARROW_LEFT , STR_FACE_EYECOLOUR_TIP } , // SCMFW_WIDGET_EYECOLOUR_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 110 , 121 , STR_EMPTY , STR_FACE_EYECOLOUR_TIP } , // SCMFW_WIDGET_EYECOLOUR
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 110 , 121 , SPR_ARROW_RIGHT , STR_FACE_EYECOLOUR_TIP } , // SCMFW_WIDGET_EYECOLOUR_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 158 , 169 , SPR_ARROW_LEFT , STR_FACE_CHIN_TIP } , // SCMFW_WIDGET_CHIN_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 158 , 169 , STR_EMPTY , STR_FACE_CHIN_TIP } , // SCMFW_WIDGET_CHIN
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 158 , 169 , SPR_ARROW_RIGHT , STR_FACE_CHIN_TIP } , // SCMFW_WIDGET_CHIN_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 98 , 109 , SPR_ARROW_LEFT , STR_FACE_EYEBROWS_TIP } , // SCMFW_WIDGET_EYEBROWS_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 98 , 109 , STR_EMPTY , STR_FACE_EYEBROWS_TIP } , // SCMFW_WIDGET_EYEBROWS
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 98 , 109 , SPR_ARROW_RIGHT , STR_FACE_EYEBROWS_TIP } , // SCMFW_WIDGET_EYEBROWS_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 146 , 157 , SPR_ARROW_LEFT , STR_FACE_LIPS_MOUSTACHE_TIP } , // SCMFW_WIDGET_LIPS_MOUSTACHE_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 146 , 157 , STR_EMPTY , STR_FACE_LIPS_MOUSTACHE_TIP } , // SCMFW_WIDGET_LIPS_MOUSTACHE
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 146 , 157 , SPR_ARROW_RIGHT , STR_FACE_LIPS_MOUSTACHE_TIP } , // SCMFW_WIDGET_LIPS_MOUSTACHE_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 134 , 145 , SPR_ARROW_LEFT , STR_FACE_NOSE_TIP } , // SCMFW_WIDGET_NOSE_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 134 , 145 , STR_EMPTY , STR_FACE_NOSE_TIP } , // SCMFW_WIDGET_NOSE
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 134 , 145 , SPR_ARROW_RIGHT , STR_FACE_NOSE_TIP } , // SCMFW_WIDGET_NOSE_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 86 , 97 , SPR_ARROW_LEFT , STR_FACE_HAIR_TIP } , // SCMFW_WIDGET_HAIR_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 86 , 97 , STR_EMPTY , STR_FACE_HAIR_TIP } , // SCMFW_WIDGET_HAIR
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 86 , 97 , SPR_ARROW_RIGHT , STR_FACE_HAIR_TIP } , // SCMFW_WIDGET_HAIR_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 170 , 181 , SPR_ARROW_LEFT , STR_FACE_JACKET_TIP } , // SCMFW_WIDGET_JACKET_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 170 , 181 , STR_EMPTY , STR_FACE_JACKET_TIP } , // SCMFW_WIDGET_JACKET
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 170 , 181 , SPR_ARROW_RIGHT , STR_FACE_JACKET_TIP } , // SCMFW_WIDGET_JACKET_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 182 , 193 , SPR_ARROW_LEFT , STR_FACE_COLLAR_TIP } , // SCMFW_WIDGET_COLLAR_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 182 , 193 , STR_EMPTY , STR_FACE_COLLAR_TIP } , // SCMFW_WIDGET_COLLAR
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 182 , 193 , SPR_ARROW_RIGHT , STR_FACE_COLLAR_TIP } , // SCMFW_WIDGET_COLLAR_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 194 , 205 , SPR_ARROW_LEFT , STR_FACE_TIE_EARRING_TIP } , // SCMFW_WIDGET_TIE_EARRING_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 194 , 205 , STR_EMPTY , STR_FACE_TIE_EARRING_TIP } , // SCMFW_WIDGET_TIE_EARRING
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 194 , 205 , SPR_ARROW_RIGHT , STR_FACE_TIE_EARRING_TIP } , // SCMFW_WIDGET_TIE_EARRING_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 122 , 133 , SPR_ARROW_LEFT , STR_FACE_GLASSES_TIP_2 } , // SCMFW_WIDGET_GLASSES_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 122 , 133 , STR_EMPTY , STR_FACE_GLASSES_TIP_2 } , // SCMFW_WIDGET_GLASSES
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 122 , 133 , SPR_ARROW_RIGHT , STR_FACE_GLASSES_TIP_2 } , // SCMFW_WIDGET_GLASSES_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 110 , 121 , SPR_ARROW_LEFT , STR_FACE_EYECOLOUR_TIP } , // SCMFW_WIDGET_EYECOLOUR_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 110 , 121 , STR_EMPTY , STR_FACE_EYECOLOUR_TIP } , // SCMFW_WIDGET_EYECOLOUR
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 110 , 121 , SPR_ARROW_RIGHT , STR_FACE_EYECOLOUR_TIP } , // SCMFW_WIDGET_EYECOLOUR_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 158 , 169 , SPR_ARROW_LEFT , STR_FACE_CHIN_TIP } , // SCMFW_WIDGET_CHIN_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 158 , 169 , STR_EMPTY , STR_FACE_CHIN_TIP } , // SCMFW_WIDGET_CHIN
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 158 , 169 , SPR_ARROW_RIGHT , STR_FACE_CHIN_TIP } , // SCMFW_WIDGET_CHIN_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 98 , 109 , SPR_ARROW_LEFT , STR_FACE_EYEBROWS_TIP } , // SCMFW_WIDGET_EYEBROWS_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 98 , 109 , STR_EMPTY , STR_FACE_EYEBROWS_TIP } , // SCMFW_WIDGET_EYEBROWS
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 98 , 109 , SPR_ARROW_RIGHT , STR_FACE_EYEBROWS_TIP } , // SCMFW_WIDGET_EYEBROWS_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 146 , 157 , SPR_ARROW_LEFT , STR_FACE_LIPS_MOUSTACHE_TIP } , // SCMFW_WIDGET_LIPS_MOUSTACHE_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 146 , 157 , STR_EMPTY , STR_FACE_LIPS_MOUSTACHE_TIP } , // SCMFW_WIDGET_LIPS_MOUSTACHE
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 146 , 157 , SPR_ARROW_RIGHT , STR_FACE_LIPS_MOUSTACHE_TIP } , // SCMFW_WIDGET_LIPS_MOUSTACHE_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 134 , 145 , SPR_ARROW_LEFT , STR_FACE_NOSE_TIP } , // SCMFW_WIDGET_NOSE_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 134 , 145 , STR_EMPTY , STR_FACE_NOSE_TIP } , // SCMFW_WIDGET_NOSE
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 134 , 145 , SPR_ARROW_RIGHT , STR_FACE_NOSE_TIP } , // SCMFW_WIDGET_NOSE_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 86 , 97 , SPR_ARROW_LEFT , STR_FACE_HAIR_TIP } , // SCMFW_WIDGET_HAIR_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 86 , 97 , STR_EMPTY , STR_FACE_HAIR_TIP } , // SCMFW_WIDGET_HAIR
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 86 , 97 , SPR_ARROW_RIGHT , STR_FACE_HAIR_TIP } , // SCMFW_WIDGET_HAIR_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 170 , 181 , SPR_ARROW_LEFT , STR_FACE_JACKET_TIP } , // SCMFW_WIDGET_JACKET_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 170 , 181 , STR_EMPTY , STR_FACE_JACKET_TIP } , // SCMFW_WIDGET_JACKET
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 170 , 181 , SPR_ARROW_RIGHT , STR_FACE_JACKET_TIP } , // SCMFW_WIDGET_JACKET_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 182 , 193 , SPR_ARROW_LEFT , STR_FACE_COLLAR_TIP } , // SCMFW_WIDGET_COLLAR_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 182 , 193 , STR_EMPTY , STR_FACE_COLLAR_TIP } , // SCMFW_WIDGET_COLLAR
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 182 , 193 , SPR_ARROW_RIGHT , STR_FACE_COLLAR_TIP } , // SCMFW_WIDGET_COLLAR_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 194 , 205 , SPR_ARROW_LEFT , STR_FACE_TIE_EARRING_TIP } , // SCMFW_WIDGET_TIE_EARRING_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 194 , 205 , STR_EMPTY , STR_FACE_TIE_EARRING_TIP } , // SCMFW_WIDGET_TIE_EARRING
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 194 , 205 , SPR_ARROW_RIGHT , STR_FACE_TIE_EARRING_TIP } , // SCMFW_WIDGET_TIE_EARRING_R
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 175 , 183 , 122 , 133 , SPR_ARROW_LEFT , STR_FACE_GLASSES_TIP_2 } , // SCMFW_WIDGET_GLASSES_L
{ WWT_PUSHTXTBTN , RESIZE_NONE , COLOUR_GREY , 184 , 208 , 122 , 133 , STR_EMPTY , STR_FACE_GLASSES_TIP_2 } , // SCMFW_WIDGET_GLASSES
{ WWT_PUSHIMGBTN , RESIZE_NONE , COLOUR_GREY , 209 , 217 , 122 , 133 , SPR_ARROW_RIGHT , STR_FACE_GLASSES_TIP_2 } , // SCMFW_WIDGET_GLASSES_R
{ WWT_EMPTY , RESIZE_NONE , COLOUR_GREY , 96 , 170 , 60 , 205 , 0x0 , STR_NULL } , // SCMFW_WIDGET_LABELS
{ WIDGETS_END } ,
} ;
@ -1070,7 +1072,7 @@ class SelectCompanyManagerFaceWindow : public Window
void DrawFaceStringLabel ( byte widget_index , StringID str , uint8 val , bool is_bool_widget )
{
/* Write the label in gold (0x2) to the left of the button. */
DrawString ( 0 , this - > widget [ widget_index] . left - ( is_bool_widget ? 5 : 14 ) , this - > widget [ widget_index ] . top + 1 , str , TC_GOLD , SA_RIGHT ) ;
DrawString ( this - > widget [ SCMFW_WIDGET_LABELS] . left , this - > widget [ SCMFW_WIDGET_LABELS ] . right , this - > widget [ widget_index ] . top + 1 , str , TC_GOLD , SA_RIGHT ) ;
if ( ! this - > IsWidgetDisabled ( widget_index ) ) {
if ( is_bool_widget ) {