jaildesigner-jailgames/coffee-crisis
1
0
Fork 1
Code Issues Pull Requests Projects Releases 14 Wiki Activity

ui: F1-F12 i ESC deixen de comptar com a any-key skip (logo/intro/instructions/title/demo)

Browse Source
This commit is contained in:
Sergio Valor
2026-05-19 20:03:11 +02:00
parent 1129f1116e
commit bded70a52a
5 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/core/input/input.cpp
+27 -7
View File
@@ -157,25 +157,45 @@ auto Input::checkGameControllerInput(Action input, Repeat repeat, int index) ->
return PRESS_EDGE;
}
// Comprueba si hay almenos un input activo
// Comprueba si hay almenos un input "humano" activo (moviment, ACCEPT/CANCEL,
// FIRE_*). Exclou les accions reservades a hotkeys globals (EXIT, PAUSE,
// WINDOW_*, *SHADER*) perque prémer F1-F12 o ESC no s'ha de comptar com
// "qualsevol tecla" — ningu vol saltar una intro per modificar el zoom.
auto Input::checkAnyInput(Device device, int index) -> bool {
if (device == Device::ANY) {
index = 0;
}
auto is_skippable = [](Action a) {
switch (a) {
case Action::UP:
case Action::DOWN:
case Action::LEFT:
case Action::RIGHT:
case Action::ACCEPT:
case Action::CANCEL:
case Action::FIRE_LEFT:
case Action::FIRE_CENTER:
case Action::FIRE_RIGHT:
return true;
default:
return false;
}
};
if (device == Device::KEYBOARD || device == Device::ANY) {
const bool *key_states = SDL_GetKeyboardState(nullptr);
if (std::ranges::any_of(key_bindings_,
[key_states](const auto &key_binding) { return key_states[key_binding.scancode]; })) {
return true;
for (std::size_t i = 0; i < key_bindings_.size(); ++i) {
if (is_skippable(static_cast<Action>(i)) && key_states[key_bindings_[i].scancode]) {
return true;
}
}
}
if (gameControllerFound() && index >= 0 && index < (int)connected_controllers_.size()) {
if (device == Device::GAMECONTROLLER || device == Device::ANY) {
for (auto &game_controller_binding : game_controller_bindings_) {
if (SDL_GetGamepadButton(connected_controllers_[index], game_controller_binding.button)) {
for (std::size_t i = 0; i < game_controller_bindings_.size(); ++i) {
if (is_skippable(static_cast<Action>(i)) && SDL_GetGamepadButton(connected_controllers_[index], game_controller_bindings_[i].button)) {
return true;
}
}