From 56dd646dde20e8e298ef11761cb3141872f9185a Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Mon, 30 Aug 2021 13:37:28 +0200 Subject: [PATCH] Centered new/translated GetReady text --- media/font/nokia_big.txt | 208 +++++++++++++++++++-------------------- source/game.cpp | 17 ++-- 2 files changed, 114 insertions(+), 111 deletions(-) diff --git a/media/font/nokia_big.txt b/media/font/nokia_big.txt index 4ccd757..82d3a41 100644 --- a/media/font/nokia_big.txt +++ b/media/font/nokia_big.txt @@ -1,193 +1,193 @@ # box width -10 +20 # box height -10 +20 # 32 espacio ( ) -7 +14 # 33 ! -4 +8 # 34 " -5 +10 # 35 # -7 +14 # 36 $ -7 +14 # 37 % -8 +16 # 38 & -8 +16 # 39 ' -3 +6 # 40 ( -5 +10 # 41 ) -5 +10 # 42 * -7 +14 # 43 + -7 +14 # 44 , -4 +8 # 45 - -6 +12 # 46 . -4 +8 # 47 / -5 +10 # 48 0 -7 +14 # 49 1 -5 +10 # 50 2 -7 -# 51 3 -7 -# 52 4 -7 -# 53 5 -7 -# 54 6 -7 -# 55 7 -7 -# 56 8 -7 -# 57 9 -7 +14 +# 51 6 +14 +# 52 8 +14 +# 53 10 +14 +# 54 12 +14 +# 55 14 +14 +# 56 16 +14 +# 57 18 +14 # 58 : -4 +8 # 59 ; -4 +8 # 60 < -6 +12 # 61 = -6 +12 # 62 > -6 +12 # 63 ? -7 +14 # 64 @ -8 +16 # 65 A -7 +14 # 66 B -7 +14 # 67 C -7 +14 # 68 D -7 +14 # 69 E -7 +14 # 70 F -7 +14 # 71 G -7 +14 # 72 H -7 +14 # 73 I -4 +8 # 74 J -6 +12 # 75 K -8 +16 # 76 L -6 +12 # 77 M -9 +18 # 78 N -8 +16 # 79 O -8 +16 # 80 P -7 +14 # 81 Q -8 +16 # 82 R -7 +14 # 83 S -6 +12 # 84 T -8 +16 # 85 U -7 +14 # 86 V -8 +16 # 87 W -9 +18 # 88 X -8 +16 # 89 Y -8 +16 # 90 Z -7 +14 # 91 [ -4 -# 92 \ -5 -# 93 ] -4 -# 94 ^ -5 -# 95 _ 8 +# 92 \ +10 +# 93 ] +8 +# 94 ^ +10 +# 95 _ +16 # 96 ` -4 +8 # 97 a -7 +14 # 98 b -7 +14 # 99 c -6 +12 # 100 d -7 +14 # 101 e -7 +14 # 102 f -5 +10 # 103 g -7 +14 # 104 h -7 +14 # 105 i -4 +8 # 106 j -5 +10 # 107 k -7 +14 # 108 l -4 +8 # 109 m 10 # 110 n -7 +14 # 111 o -7 +14 # 112 p -7 +14 # 113 q -7 +14 # 114 r -6 +12 # 115 s -6 +12 # 116 t -5 +10 # 117 u -7 +14 # 118 v -7 +14 # 119 w -9 +18 # 120 x -7 +14 # 121 y -7 +14 # 122 z -7 +14 # 123 { -> ñ -7 +14 # 124 | -> ç -7 +14 # 125 } 0 # 126 ~ diff --git a/source/game.cpp b/source/game.cpp index bd3291b..8927362 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -2960,7 +2960,8 @@ void Game::renderMessages() mSpriteGetReady->setPosX((int)mGetReadyBitmapPath[mCounter]); //mSpriteGetReady->render(); const color_t color = {0x17, 0x17, 0x26}; - mTextBig->writeShadowed((int)mGetReadyBitmapPath[mCounter], PLAY_AREA_CENTER_Y - 8, mLang->getText(75), color, 2); + //mTextBig->writeShadowed((int)mGetReadyBitmapPath[mCounter], PLAY_AREA_CENTER_Y - 8, mLang->getText(75), color, 2); + mTextBig->writeDX(TXT_STROKE, (int)mGetReadyBitmapPath[mCounter], PLAY_AREA_CENTER_Y - 8, mLang->getText(75),1, noColor, 1, shdwTxtColor); } // Time Stopped @@ -2987,9 +2988,9 @@ void Game::renderMessages() mTextBig->writeDX(TXT_CENTER | TXT_SHADOW, PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, mLang->getText(37), 0, noColor, 2, shdwTxtColor); // STAGE NUMBER - std::string text = mLang->getText(38) + std::to_string(mStage[mCurrentStage].number); if (mStageBitmapCounter < STAGE_COUNTER) { + std::string text = mLang->getText(38) + std::to_string(mStage[mCurrentStage].number); if (!mGameCompleted) { mTextBig->writeDX(TXT_CENTER | TXT_SHADOW, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter], text, 1, noColor, 2, shdwTxtColor); @@ -3422,23 +3423,25 @@ void Game::initPaths() mStageBitmapPath[i] = (mSin[(int)(((i - 149) * 1.8f) + 90)] * (centerPoint + 17) - 17); } - const float start1 = PLAY_AREA_LEFT - 130; - const float finish1 = PLAY_AREA_CENTER_X - 55; + // Letrero de GetReady + const int size = mTextBig->lenght(mLang->getText(75)); + + const float start1 = PLAY_AREA_LEFT - size; + const float finish1 = PLAY_AREA_CENTER_X - (size / 2); const float start2 = finish1; - const float finish2 = PLAY_AREA_RIGHT + 20; + const float finish2 = PLAY_AREA_RIGHT; const float distance1 = finish1 - start1; const float distance2 = finish2 - start2; - // Letrero de GetReady for (int i = 0; i < STAGE_COUNTER; i++) { if (i < firstPart) { mGetReadyBitmapPath[i] = mSin[(int)(i * 1.8f)]; mGetReadyBitmapPath[i] *= distance1; - mGetReadyBitmapPath[i] -= 130; + mGetReadyBitmapPath[i] -= size; } else if (i < secondPart) mGetReadyBitmapPath[i] = (int)finish1;