From 856ecd41e89e54f438a6678ec327b8eb38cc0f4e Mon Sep 17 00:00:00 2001 From: KUDr Date: Sat, 24 Feb 2007 19:43:50 +0000 Subject: [PATCH] (svn r8887) -Fix (r8879)[MorphOS]: initialization of mouth_table[] skipped by goto --- src/players.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/players.cpp b/src/players.cpp index 2ca91b4a05..671967421f 100644 --- a/src/players.cpp +++ b/src/players.cpp @@ -171,13 +171,15 @@ void DrawPlayerFace(uint32 face, int color, int x, int y) DrawSprite((lips * 10 >> 4) + 0x351, PAL_NONE, x, y); } - /* Nose */ - static const SpriteID mouth_table[] = { 0x34C, 0x34D, 0x34F }; - switch (gen_race) { - case WHITE_MALE: DrawSprite(0x349 + nose, PAL_NONE, x, y); break; - case WHITE_FEMALE: DrawSprite(mouth_table[(nose * 3 >> 3)], PAL_NONE, x, y); break; - case BLACK_MALE: DrawSprite(0x393 + (nose & 3), PAL_NONE, x, y); break; - case BLACK_FEMALE: DrawSprite(0x3B3 + (nose * 5 >> 3), PAL_NONE, x, y); break; + { + /* Nose */ + static const SpriteID mouth_table[] = { 0x34C, 0x34D, 0x34F }; + switch (gen_race) { + case WHITE_MALE: DrawSprite(0x349 + nose, PAL_NONE, x, y); break; + case WHITE_FEMALE: DrawSprite(mouth_table[(nose * 3 >> 3)], PAL_NONE, x, y); break; + case BLACK_MALE: DrawSprite(0x393 + (nose & 3), PAL_NONE, x, y); break; + case BLACK_FEMALE: DrawSprite(0x3B3 + (nose * 5 >> 3), PAL_NONE, x, y); break; + } } skip_mouth: