diff --git a/src/renderer/Hud.cpp b/src/renderer/Hud.cpp index dc34623..dacec8b 100644 --- a/src/renderer/Hud.cpp +++ b/src/renderer/Hud.cpp @@ -1327,24 +1327,48 @@ void CHud::DrawAfterFade() int w = 640; int y = 0; { + CFont::SetJustifyOff(); + CFont::SetBackgroundOff(); + CFont::SetColor(CRGBA(255, 255, 255, 255)); + CFont::SetScale(0.75f, 0.75f); + CFont::SetCentreOn(); + CFont::SetPropOn(); + CFont::SetFontStyle(FONT_BANK); #define CRECT(X, Y, W, H) CRect(X, (Y) * 480.f / 360.f, (W) + (X), ((H) + (Y)) * 480.f / 360.f) +#define PRINT(S, X, Y, W) CFont::SetCentreSize(W); \ + CFont::PrintString((X) + ((W) / 2), (Y) * (480.f / 360.f), (wchar*) L ## S); // l CSprite2d::DrawRect(CRECT(40, 6 + y, 90, 20), CRGBA(0, 0, 0, 128)); + PRINT("L1", 40, 12 + y, 90); CSprite2d::DrawRect(CRECT(180, 6 + y, 90, 20), CRGBA(0, 0, 0, 128)); + PRINT("L2", 180, 12 + y, 90); // r CSprite2d::DrawRect(CRECT(w - 40 - 90, 6 + y, 90, 20), CRGBA(0, 0, 0, 128)); + PRINT("R1", w - 40 - 90, 12 + y, 90); CSprite2d::DrawRect(CRECT(w - 180 - 90, 6 + y, 90, 20), CRGBA(0, 0, 0, 128)); + PRINT("R2", w - 180 - 90, 12 + y, 90); // select, start CSprite2d::DrawRect(CRECT(320 - 80, 286 + y, 60, 20), CRGBA(0, 0, 0, 128)); + PRINT("select", 320 - 80, 290 + y, 60); CSprite2d::DrawRect(CRECT(320 + 20, 286 + y, 60, 20), CRGBA(0, 0, 0, 128)); + PRINT("start", 320 + 20, 290 + y, 60); // dpad CSprite2d::DrawRect(CRECT(0, 80 + y, w / 4, 120), CRGBA(0, 0, 0, 128)); + PRINT("/\\", w / 8 - 15, 90 + y, 30); + PRINT("v", w / 8 - 15, 160 + y, 30); + PRINT("<", w / 8 - 60, 125 + y, 30); + PRINT(">", w / 8 + 30, 125 + y, 30); // abxy CSprite2d::DrawRect(CRECT(w - w / 4, 80 + y, w / 4, 120), CRGBA(0, 0, 0, 128)); + PRINT("/\\", w - w / 8 - 15, 90 + y, 30); + PRINT("X", w - w / 8 - 15, 160 + y, 30); + PRINT("[]", w - w / 8 - 60, 125 + y, 30); + PRINT("O", w - w / 8 + 30, 125 + y, 30); +#undef PRINT #undef CRECT } } diff --git a/src/skel/symbian/symbian.cpp b/src/skel/symbian/symbian.cpp index b9db7c2..3cf05b7 100644 --- a/src/skel/symbian/symbian.cpp +++ b/src/skel/symbian/symbian.cpp @@ -707,11 +707,11 @@ public: if (y < 125) { b = JOY_Y; } else if (y > 155) { - b = JOY_A; + b = JOY_B; } else if (x < w - w / 8) { b = JOY_X; } else { - b = JOY_B; + b = JOY_A; } activeZone[i] = b + 1; virtualButtons[b] = 1;