From b32e638e9435fd6fbe023ad1fb68f0050130ede2 Mon Sep 17 00:00:00 2001 From: Richard Wheeler <2762690+zephyris@users.noreply.github.com> Date: Mon, 27 Jan 2025 12:12:13 +0000 Subject: [PATCH] Change: Draw company manager face jacket after collar Change the sprite drawing order defined by the enum and table to draw the (shirt) collar first, under the jacket. Simplifies new graphics development, allowing the shirt collar sprite to be a full shirt. --- src/company_manager_face.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/company_manager_face.h b/src/company_manager_face.h index dbb11de5fd..ed551c49cd 100644 --- a/src/company_manager_face.h +++ b/src/company_manager_face.h @@ -44,8 +44,8 @@ enum CompanyManagerFaceVariable { CMFV_LIPS, CMFV_NOSE, CMFV_HAIR, - CMFV_JACKET, CMFV_COLLAR, + CMFV_JACKET, CMFV_TIE_EARRING, CMFV_GLASSES, CMFV_END, @@ -77,8 +77,8 @@ static const CompanyManagerFaceBitsInfo _cmf_info[] = { /* CMFV_LIPS */ { 13, 4, { 12, 10, 9, 9 }, { 0x35B, 0x351, 0x3A5, 0x3C8 } }, ///< Depends on !CMFV_HAS_MOUSTACHE /* CMFV_NOSE */ { 17, 3, { 8, 4, 4, 5 }, { 0x349, 0x34C, 0x393, 0x3B3 } }, ///< Depends on !CMFV_HAS_MOUSTACHE /* CMFV_HAIR */ { 20, 4, { 9, 5, 5, 5 }, { 0x382, 0x38B, 0x3D4, 0x3D9 } }, - /* CMFV_JACKET */ { 24, 2, { 3, 3, 3, 3 }, { 0x36B, 0x378, 0x36B, 0x378 } }, /* CMFV_COLLAR */ { 26, 2, { 4, 4, 4, 4 }, { 0x36E, 0x37B, 0x36E, 0x37B } }, + /* CMFV_JACKET */ { 24, 2, { 3, 3, 3, 3 }, { 0x36B, 0x378, 0x36B, 0x378 } }, /* CMFV_TIE_EARRING */ { 28, 3, { 6, 3, 6, 3 }, { 0x372, 0x37F, 0x372, 0x3D1 } }, ///< Depends on CMFV_HAS_TIE_EARRING /* CMFV_GLASSES */ { 31, 1, { 2, 2, 2, 2 }, { 0x347, 0x347, 0x3AE, 0x3AE } } ///< Depends on CMFV_HAS_GLASSES };