Browse Source
1. Makes START a modifier key. 2. Main modifier actions are now displayed as hints while the modifier is pressed. 3. Mouse simulation now available on all controllers: SELECT + D-Pad to move mouse SELECT + Left/Right should button to click START + | Action ---------- | ------ SELECT | Menu UP | Menu DOWN | Map LEFT | Character info RIGHT | Inventory B (Bottom) | Spell book Y (Left) | Quest log This makes all actions available on controllers without sticks and ZL/ZR.pull/550/head
Gleb Mazovetskiy
6 years ago
committed by
Anders Jenbo
13 changed files with 286 additions and 90 deletions
@ -0,0 +1,132 @@
|
||||
#include "controls/modifier_hints.h" |
||||
|
||||
#include <cstddef> |
||||
|
||||
#include "devilution.h" |
||||
#include "controls/controller.h" |
||||
#include "controls/game_controls.h" |
||||
|
||||
namespace dvl { |
||||
|
||||
namespace { |
||||
|
||||
int CalculateTextWidth(const char *s) |
||||
{ |
||||
int l = 0; |
||||
while (*s) { |
||||
l += fontkern[fontframe[gbFontTransTbl[static_cast<unsigned char>(*s++)]]] + 1; |
||||
} |
||||
return l; |
||||
} |
||||
|
||||
int SpaceWidth() |
||||
{ |
||||
static const int kSpaceWidth = CalculateTextWidth(" "); |
||||
return kSpaceWidth; |
||||
} |
||||
|
||||
struct CircleMenuHint { |
||||
CircleMenuHint(bool is_dpad, const char *top, const char *right, const char *bottom, const char *left) |
||||
: is_dpad(is_dpad) |
||||
, top(top) |
||||
, top_w(CalculateTextWidth(top)) |
||||
, right(right) |
||||
, right_w(CalculateTextWidth(right)) |
||||
, bottom(bottom) |
||||
, bottom_w(CalculateTextWidth(bottom)) |
||||
, left(left) |
||||
, left_w(CalculateTextWidth(left)) |
||||
, x_mid(left_w + SpaceWidth() * 2.5) |
||||
{ |
||||
} |
||||
|
||||
bool is_dpad; |
||||
|
||||
const char *top; |
||||
int top_w; |
||||
const char *right; |
||||
int right_w; |
||||
const char *bottom; |
||||
int bottom_w; |
||||
const char *left; |
||||
int left_w; |
||||
|
||||
int x_mid; |
||||
}; |
||||
|
||||
bool IsTopActive(const CircleMenuHint &hint) |
||||
{ |
||||
if (hint.is_dpad) |
||||
return IsControllerButtonPressed(ControllerButton::BUTTON_DPAD_UP); |
||||
return IsControllerButtonPressed(ControllerButton::BUTTON_Y); |
||||
} |
||||
|
||||
bool IsRightActive(const CircleMenuHint &hint) |
||||
{ |
||||
if (hint.is_dpad) |
||||
return IsControllerButtonPressed(ControllerButton::BUTTON_DPAD_RIGHT); |
||||
return IsControllerButtonPressed(ControllerButton::BUTTON_B); |
||||
} |
||||
|
||||
bool IsBottomActive(const CircleMenuHint &hint) |
||||
{ |
||||
if (hint.is_dpad) |
||||
return IsControllerButtonPressed(ControllerButton::BUTTON_DPAD_DOWN); |
||||
return IsControllerButtonPressed(ControllerButton::BUTTON_A); |
||||
} |
||||
|
||||
bool IsLeftActive(const CircleMenuHint &hint) |
||||
{ |
||||
if (hint.is_dpad) |
||||
return IsControllerButtonPressed(ControllerButton::BUTTON_DPAD_LEFT); |
||||
return IsControllerButtonPressed(ControllerButton::BUTTON_X); |
||||
} |
||||
|
||||
text_color CircleMenuHintTextColor(bool active) |
||||
{ |
||||
return active ? COL_BLUE : COL_GOLD; |
||||
} |
||||
|
||||
void DrawCircleMenuHint(const CircleMenuHint &hint, int x, int y) |
||||
{ |
||||
constexpr int kLineHeight = 25; |
||||
PrintGameStr(x + hint.x_mid - hint.top_w / 2, y, hint.top, CircleMenuHintTextColor(IsTopActive(hint))); |
||||
y += kLineHeight; |
||||
|
||||
PrintGameStr(x, y, hint.left, CircleMenuHintTextColor(IsLeftActive(hint))); |
||||
PrintGameStr(x + hint.left_w + 5 * SpaceWidth(), y, hint.right, CircleMenuHintTextColor(IsRightActive(hint))); |
||||
y += kLineHeight; |
||||
|
||||
PrintGameStr(x + hint.x_mid - hint.bottom_w / 2, y, hint.bottom, CircleMenuHintTextColor(IsBottomActive(hint))); |
||||
} |
||||
|
||||
constexpr int kCirclesDist = 200; |
||||
constexpr int kCirclesTop = VIEWPORT_HEIGHT / 2 + TILE_SIZE / 2; |
||||
|
||||
void DrawStartModifierMenu() |
||||
{ |
||||
if (!start_modifier_active) |
||||
return; |
||||
static const CircleMenuHint kDpad(/*is_dpad=*/true, /*top=*/"Menu", /*right=*/"Inv", /*bottom=*/"Map", /*left=*/"Char"); |
||||
static const CircleMenuHint kButtons(/*is_dpad=*/false, /*top=*/"", /*right=*/"", /*bottom=*/"Spells", /*left=*/"Quests"); |
||||
DrawCircleMenuHint(kDpad, SCREEN_WIDTH / 2 - kDpad.x_mid - kCirclesDist / 2, kCirclesTop); |
||||
DrawCircleMenuHint(kButtons, SCREEN_WIDTH / 2 - kButtons.x_mid + kCirclesDist / 2, kCirclesTop); |
||||
} |
||||
|
||||
void DrawSelectModifierMenu() |
||||
{ |
||||
if (!select_modifier_active) |
||||
return; |
||||
static const CircleMenuHint kSpells(/*is_dpad=*/false, "F6", "F8", "F7", "F5"); |
||||
DrawCircleMenuHint(kSpells, SCREEN_WIDTH / 2 - kSpells.x_mid + kCirclesDist / 2, kCirclesTop); |
||||
} |
||||
|
||||
} // namespace
|
||||
|
||||
void DrawControllerModifierHints() |
||||
{ |
||||
DrawStartModifierMenu(); |
||||
DrawSelectModifierMenu(); |
||||
} |
||||
|
||||
} // namespace dvl
|
||||
@ -0,0 +1,7 @@
|
||||
#pragma once |
||||
|
||||
namespace dvl { |
||||
|
||||
void DrawControllerModifierHints(); |
||||
|
||||
} // namespace dvl
|
||||
Loading…
Reference in new issue