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

deshabilitados los sonidos en el modo demo

Browse Source
This commit is contained in:
Sergio
2024-07-05 23:20:19 +02:00
parent ad170e8e0e
commit 2764ff2e93
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -172,6 +172,10 @@ macos:
$(CXX) $(SOURCES) $(CXXFLAGS) $(LDFLAGS) -o "$(TARGET_FILE)" $(CXX) $(SOURCES) $(CXXFLAGS) $(LDFLAGS) -o "$(TARGET_FILE)"
macos_fast:
$(CXX) $(SOURCES) -D VERBOSE -std=c++11 -Wall -lSDL2 -Wno-deprecated -framework OpenGL -o "$(TARGET_FILE)"
macos_debug: macos_debug:
$(CXX) $(SOURCES) -D DEBUG $(CXXFLAGS) $(LDFLAGS) -o "$(TARGET_FILE)_debug" $(CXX) $(SOURCES) -D DEBUG $(CXXFLAGS) $(LDFLAGS) -o "$(TARGET_FILE)_debug"

30
source/game.cpp
View File

@@ -245,6 +245,7 @@ void Game::init(int playerID)
if (demo.enabled) if (demo.enabled)
{ {
// Selecciona una pantalla al azar
const int num = rand() % 2; const int num = rand() % 2;
if (num == 0) if (num == 0)
{ {
@@ -256,6 +257,15 @@ void Game::init(int playerID)
balloonsPopped = 1800; balloonsPopped = 1800;
currentStage = 6; currentStage = 6;
} }
// Añade 0, 1 o 2 cafes al jugador
// for (int i = 0; i < rand() % 4; ++i)
{
players[0]->hasExtraHit();
}
// Deshabilita los sonidos
JA_EnableSound(false);
} }
initPaths(); initPaths();
@@ -277,9 +287,10 @@ void Game::init(int playerID)
} }
// Modo demo // Modo demo
demo.recording = false;
#ifdef RECORDING #ifdef RECORDING
demo.recording = true; demo.recording = true;
#else
demo.recording = false;
#endif #endif
demo.counter = 0; demo.counter = 0;
@@ -2118,18 +2129,15 @@ void Game::checkBulletBalloonCollision()
// Explota el globo // Explota el globo
popBalloon(balloon); popBalloon(balloon);
// Si no es el modo demo, genera un sonido // Sonido de explosión
if (!demo.enabled) JA_PlaySound(balloonSound);
{
JA_PlaySound(balloonSound);
}
// Deshabilita la bala // Deshabilita la bala
bullet->disable(); bullet->disable();
// Suelta el item en caso de que salga uno // Suelta el item en caso de que salga uno
const Uint8 droppeditem = dropItem(); const Uint8 droppeditem = dropItem();
//if ((droppeditem != NO_KIND) && !(demo.enabled) && !(demo.recording)) // if ((droppeditem != NO_KIND) && !(demo.enabled) && !(demo.recording))
if ((droppeditem != NO_KIND) && !(demo.recording)) if ((droppeditem != NO_KIND) && !(demo.recording))
{ {
if (droppeditem != ITEM_COFFEE_MACHINE) if (droppeditem != ITEM_COFFEE_MACHINE)
@@ -2536,7 +2544,7 @@ void Game::update()
#ifdef RECORDING #ifdef RECORDING
checkInput(); checkInput();
if (demo.recording) if (demo.recording)
{ {
if (demo.counter >= TOTAL_DEMO_DATA) if (demo.counter >= TOTAL_DEMO_DATA)
@@ -3034,6 +3042,12 @@ void Game::run()
checkEvents(); // Tiene que ir antes del render checkEvents(); // Tiene que ir antes del render
render(); render();
} }
// Vuelve a dejar el sonido como estaba
if (demo.enabled)
{
JA_EnableSound(options->audio.sound.enabled);
}
} }
// Indica si se puede crear una powerball // Indica si se puede crear una powerball