jaildesigner-jailgames/coffee_crisis_arcade_edition
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 13 Wiki Activity

fix: al voler definir els botons dels mandos sense tindre cap mando conectat, petava tot

Browse Source
This commit is contained in:
Sergio
2024-07-26 11:58:03 +02:00
parent 1632441c31
commit 5e5d7f5f27
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/define_buttons.cpp
View File

@@ -111,11 +111,11 @@ void DefineButtons::checkInput()
while (SDL_PollEvent(&event)) while (SDL_PollEvent(&event))
{ {
// Evento de salida de la aplicación // Evento de salida de la aplicación
if (event.type == SDL_QUIT) if (event.type == SDL_QUIT)
{ {
section->name = SECTION_PROG_QUIT; section->name = SECTION_PROG_QUIT;
break; break;
} }
if (event.type == SDL_CONTROLLERBUTTONDOWN) if (event.type == SDL_CONTROLLERBUTTONDOWN)
doControllerButtonDown(&event.cbutton); doControllerButtonDown(&event.cbutton);
@@ -126,9 +126,12 @@ void DefineButtons::checkInput()
// Habilita el objeto // Habilita el objeto
void DefineButtons::enable(int index) void DefineButtons::enable(int index)
{ {
enabled = true; if (input->getNumControllers() > 0)
indexController = index; {
indexButton = 0; enabled = true;
indexController = index;
indexButton = 0;
}
} }
// Comprueba si está habilitado // Comprueba si está habilitado

4
source/scoreboard.cpp
View File

@@ -215,7 +215,7 @@ void Scoreboard::fillBackgroundTexture()
else if (mode[SCOREBOARD_LEFT_SIDE] == SCOREBOARD_MODE_DEMO) else if (mode[SCOREBOARD_LEFT_SIDE] == SCOREBOARD_MODE_DEMO)
{ {
if (counter % 2 == 0) if (counter % 10 < 8)
{ {
textScoreBoard->writeCentered(offsetScoreP1.x, offsetScoreP1.y, "Mode"); textScoreBoard->writeCentered(offsetScoreP1.x, offsetScoreP1.y, "Mode");
textScoreBoard->writeCentered(offsetMultP1Label.x, offsetMultP1Label.y, "Demo"); textScoreBoard->writeCentered(offsetMultP1Label.x, offsetMultP1Label.y, "Demo");
@@ -235,7 +235,7 @@ void Scoreboard::fillBackgroundTexture()
else if (mode[SCOREBOARD_RIGHT_SIDE] == SCOREBOARD_MODE_DEMO) else if (mode[SCOREBOARD_RIGHT_SIDE] == SCOREBOARD_MODE_DEMO)
{ {
if (counter % 2 == 0) if (counter % 10 < 8)
{ {
textScoreBoard->writeCentered(offsetScoreP2.x, offsetScoreP2.y, "Mode"); textScoreBoard->writeCentered(offsetScoreP2.x, offsetScoreP2.y, "Mode");
textScoreBoard->writeCentered(offsetMultP2Label.x, offsetMultP2Label.y, "Demo"); textScoreBoard->writeCentered(offsetMultP2Label.x, offsetMultP2Label.y, "Demo");

2
source/scoreboard.h
View File

@@ -19,7 +19,7 @@ enum scoreboard_modes_e
#define SCOREBOARD_LEFT_SIDE 0 #define SCOREBOARD_LEFT_SIDE 0
#define SCOREBOARD_RIGHT_SIDE 1 #define SCOREBOARD_RIGHT_SIDE 1
#define SCOREBOARD_TICK_SPEED 1000 #define SCOREBOARD_TICK_SPEED 100
// Clase Scoreboard // Clase Scoreboard
class Scoreboard class Scoreboard