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

InputAction → enum class Input::Action

Browse Source
This commit is contained in:
Sergio Valor
2026-05-16 19:59:12 +02:00
parent 40e1140734
commit 1e6cb3bb24
12 changed files with 121 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/game.cpp
+18 -18
View File
@@ -2473,29 +2473,29 @@ void Game::processDemoInput() {
const DemoKeys &keys = demo_.data_file[demo_.counter];
if (keys.left == 1) {
players_[INDEX]->setInput(LEFT);
players_[INDEX]->setInput(Input::Action::LEFT);
}
if (keys.right == 1) {
players_[INDEX]->setInput(RIGHT);
players_[INDEX]->setInput(Input::Action::RIGHT);
}
if (keys.no_input == 1) {
players_[INDEX]->setInput(INVALID);
players_[INDEX]->setInput(Input::Action::INVALID);
}
if (keys.fire == 1 && players_[INDEX]->canFire()) {
players_[INDEX]->setInput(FIRE_CENTER);
players_[INDEX]->setInput(Input::Action::FIRE_CENTER);
createBullet(players_[INDEX]->getPosX() + (players_[INDEX]->getWidth() / 2) - 4, players_[INDEX]->getPosY() + (players_[INDEX]->getHeight() / 2), Bullet::Kind::UP, players_[INDEX]->isPowerUp(), INDEX);
players_[INDEX]->setFireCooldown(10);
}
if (keys.fire_left == 1 && players_[INDEX]->canFire()) {
players_[INDEX]->setInput(FIRE_LEFT);
players_[INDEX]->setInput(Input::Action::FIRE_LEFT);
createBullet(players_[INDEX]->getPosX() + (players_[INDEX]->getWidth() / 2) - 4, players_[INDEX]->getPosY() + (players_[INDEX]->getHeight() / 2), Bullet::Kind::LEFT, players_[INDEX]->isPowerUp(), INDEX);
players_[INDEX]->setFireCooldown(10);
}
if (keys.fire_right == 1 && players_[INDEX]->canFire()) {
players_[INDEX]->setInput(FIRE_RIGHT);
players_[INDEX]->setInput(Input::Action::FIRE_RIGHT);
createBullet(players_[INDEX]->getPosX() + (players_[INDEX]->getWidth() / 2) - 4, players_[INDEX]->getPosY() + (players_[INDEX]->getHeight() / 2), Bullet::Kind::RIGHT, players_[INDEX]->isPowerUp(), INDEX);
players_[INDEX]->setFireCooldown(10);
}
@@ -2531,20 +2531,20 @@ void Game::processPlayerLiveInput(Player *player, int i) {
const auto &device = Options::inputs[i];
// Movimiento izquierda / derecha / nada
if (input->checkInput(LEFT, Input::Repeat::ON, device.device_type, device.id)) {
player->setInput(LEFT);
if (input->checkInput(Input::Action::LEFT, Input::Repeat::ON, device.device_type, device.id)) {
player->setInput(Input::Action::LEFT);
demo_.keys.left = 1;
} else if (input->checkInput(RIGHT, Input::Repeat::ON, device.device_type, device.id)) {
player->setInput(RIGHT);
} else if (input->checkInput(Input::Action::RIGHT, Input::Repeat::ON, device.device_type, device.id)) {
player->setInput(Input::Action::RIGHT);
demo_.keys.right = 1;
} else {
player->setInput(INVALID);
player->setInput(Input::Action::INVALID);
demo_.keys.no_input = 1;
}
// Disparo al centro
if (input->checkInput(FIRE_CENTER, Input::Repeat::ON, device.device_type, device.id) && player->canFire()) {
player->setInput(FIRE_CENTER);
if (input->checkInput(Input::Action::FIRE_CENTER, Input::Repeat::ON, device.device_type, device.id) && player->canFire()) {
player->setInput(Input::Action::FIRE_CENTER);
createBullet(player->getPosX() + (player->getWidth() / 2) - 4, player->getPosY() + (player->getHeight() / 2), Bullet::Kind::UP, player->isPowerUp(), i);
player->setFireCooldown(10);
Audio::get()->playSound(bullet_sound_);
@@ -2552,8 +2552,8 @@ void Game::processPlayerLiveInput(Player *player, int i) {
}
// Disparo a la izquierda
if (input->checkInput(FIRE_LEFT, Input::Repeat::ON, device.device_type, device.id) && player->canFire()) {
player->setInput(FIRE_LEFT);
if (input->checkInput(Input::Action::FIRE_LEFT, Input::Repeat::ON, device.device_type, device.id) && player->canFire()) {
player->setInput(Input::Action::FIRE_LEFT);
createBullet(player->getPosX() + (player->getWidth() / 2) - 4, player->getPosY() + (player->getHeight() / 2), Bullet::Kind::LEFT, player->isPowerUp(), i);
player->setFireCooldown(10);
Audio::get()->playSound(bullet_sound_);
@@ -2561,8 +2561,8 @@ void Game::processPlayerLiveInput(Player *player, int i) {
}
// Disparo a la derecha
if (input->checkInput(FIRE_RIGHT, Input::Repeat::ON, device.device_type, device.id) && player->canFire()) {
player->setInput(FIRE_RIGHT);
if (input->checkInput(Input::Action::FIRE_RIGHT, Input::Repeat::ON, device.device_type, device.id) && player->canFire()) {
player->setInput(Input::Action::FIRE_RIGHT);
createBullet(player->getPosX() + (player->getWidth() / 2) - 4, player->getPosY() + (player->getHeight() / 2), Bullet::Kind::RIGHT, player->isPowerUp(), i);
player->setFireCooldown(10);
Audio::get()->playSound(bullet_sound_);
@@ -2570,7 +2570,7 @@ void Game::processPlayerLiveInput(Player *player, int i) {
}
// Pausa
if (input->checkInput(PAUSE, Input::Repeat::OFF, device.device_type, device.id)) {
if (input->checkInput(Input::Action::PAUSE, Input::Repeat::OFF, device.device_type, device.id)) {
section_->subsection = SUBSECTION_GAME_PAUSE;
}