jaildesigner-jailgames/orni-attack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor(defaults): substitueix els 999.0F restants per HIT_TIMER_INACTIVE_PLAYER

Browse Source
This commit is contained in:
Sergio Valor
2026-05-21 09:48:20 +02:00
parent 7139dea7f6
commit bb21191c5b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/scenes/game_scene.cpp
+5 -5
View File
@@ -201,8 +201,8 @@ void GameScene::stepMidGameJoin() {
// Solo se permite join si hay al menos un jugador vivo (no se puede // Solo se permite join si hay al menos un jugador vivo (no se puede
// hacer join en pantalla vacía). // hacer join en pantalla vacía).
const bool ALGU_VIU = const bool ALGU_VIU =
(match_config_.jugador1_actiu && hit_timer_per_player_[0] != 999.0F) || (match_config_.jugador1_actiu && hit_timer_per_player_[0] != Defaults::Game::HIT_TIMER_INACTIVE_PLAYER) ||
(match_config_.jugador2_actiu && hit_timer_per_player_[1] != 999.0F); (match_config_.jugador2_actiu && hit_timer_per_player_[1] != Defaults::Game::HIT_TIMER_INACTIVE_PLAYER);
if (!ALGU_VIU) { if (!ALGU_VIU) {
return; return;
} }
@@ -211,7 +211,7 @@ void GameScene::stepMidGameJoin() {
for (uint8_t pid = 0; pid < 2; pid++) { for (uint8_t pid = 0; pid < 2; pid++) {
const bool ACTIU = (pid == 0) ? match_config_.jugador1_actiu const bool ACTIU = (pid == 0) ? match_config_.jugador1_actiu
: match_config_.jugador2_actiu; : match_config_.jugador2_actiu;
const bool MUERTO_SIN_VIDAS = hit_timer_per_player_[pid] == 999.0F; const bool MUERTO_SIN_VIDAS = hit_timer_per_player_[pid] == Defaults::Game::HIT_TIMER_INACTIVE_PLAYER;
if (ACTIU && !MUERTO_SIN_VIDAS) { if (ACTIU && !MUERTO_SIN_VIDAS) {
continue; // jugador ya está jugando continue; // jugador ya está jugando
} }
@@ -284,7 +284,7 @@ auto GameScene::stepGameOver(float delta_time) -> bool {
void GameScene::stepDeathSequence(float delta_time) { void GameScene::stepDeathSequence(float delta_time) {
bool algun_mort = false; bool algun_mort = false;
for (uint8_t i = 0; i < 2; i++) { for (uint8_t i = 0; i < 2; i++) {
if (hit_timer_per_player_[i] <= 0.0F || hit_timer_per_player_[i] >= 999.0F) { if (hit_timer_per_player_[i] <= 0.0F || hit_timer_per_player_[i] >= Defaults::Game::HIT_TIMER_INACTIVE_PLAYER) {
continue; continue;
} }
algun_mort = true; algun_mort = true;
@@ -304,7 +304,7 @@ void GameScene::stepDeathSequence(float delta_time) {
} }
// Sin vidas: marcar definitivamente muerto y comprobar transición a CONTINUE. // Sin vidas: marcar definitivamente muerto y comprobar transición a CONTINUE.
hit_timer_per_player_[i] = 999.0F; hit_timer_per_player_[i] = Defaults::Game::HIT_TIMER_INACTIVE_PLAYER;
const bool P1_DEAD = !match_config_.jugador1_actiu || lives_per_player_[0] <= 0; const bool P1_DEAD = !match_config_.jugador1_actiu || lives_per_player_[0] <= 0;
const bool P2_DEAD = !match_config_.jugador2_actiu || lives_per_player_[1] <= 0; const bool P2_DEAD = !match_config_.jugador2_actiu || lives_per_player_[1] <= 0;
if (P1_DEAD && P2_DEAD) { if (P1_DEAD && P2_DEAD) {