diff --git a/CMakeLists.txt b/CMakeLists.txt index cca30b0..e1c656a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 3.10) project(jaildoctors_dilemma VERSION 1.00) +# Establece las políticas +cmake_policy(SET CMP0072 NEW) + # Configuración de compilador para MinGW en Windows, si es necesario if(WIN32 AND NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC") set(CMAKE_CXX_COMPILER "g++") diff --git a/data/palette/green-phosphor.pal b/data/palette/green-phosphor.pal index f0c36e8..b37b337 100644 --- a/data/palette/green-phosphor.pal +++ b/data/palette/green-phosphor.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 0 0 -0 16 0 -0 16 0 -0 32 0 -0 64 0 -0 96 0 -0 128 0 -0 160 0 -0 192 0 -0 224 0 +0 48 0 +0 62 0 +0 76 0 +0 91 0 +0 105 0 +0 119 0 +0 133 0 +0 147 0 +0 161 0 +0 176 0 +0 190 0 +0 204 0 +0 218 0 +0 232 0 +0 246 0 0 255 0 -64 255 64 -96 255 96 -128 255 128 -192 255 192 -255 255 255 diff --git a/data/palette/orange-screen.pal b/data/palette/orange-screen.pal index 88262ab..0183ae0 100644 --- a/data/palette/orange-screen.pal +++ b/data/palette/orange-screen.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 0 0 -0 0 0 -42 21 0 -50 25 0 -216 108 0 -255 165 0 -191 95 0 -225 112 0 -115 57 0 -140 70 0 -115 86 43 -140 105 52 -216 144 0 -255 170 0 -191 95 47 -255 165 0 +43 21 0 +58 29 0 +72 36 0 +87 43 0 +101 50 0 +116 58 0 +130 65 0 +145 72 0 +159 80 0 +174 87 0 +188 94 0 +203 101 0 +217 109 0 +232 116 0 +246 123 0 +255 128 0 diff --git a/data/palette/sweetie-16.pal b/data/palette/sweetie-16.pal index 0139203..9a7e560 100644 --- a/data/palette/sweetie-16.pal +++ b/data/palette/sweetie-16.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 26 28 44 +41 54 111 +51 60 87 +86 108 134 +59 93 201 +37 113 121 93 39 93 177 62 83 -239 125 87 -255 205 117 -167 240 112 56 183 100 -37 113 121 -41 54 111 -59 93 201 +167 240 112 65 166 246 115 239 247 -244 244 244 +239 125 87 +255 205 117 148 176 194 -86 108 134 -51 60 87 +244 244 244 diff --git a/data/palette/sweetie-16_bona.pal b/data/palette/sweetie-16_bona.pal new file mode 100644 index 0000000..0139203 --- /dev/null +++ b/data/palette/sweetie-16_bona.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +26 28 44 +93 39 93 +177 62 83 +239 125 87 +255 205 117 +167 240 112 +56 183 100 +37 113 121 +41 54 111 +59 93 201 +65 166 246 +115 239 247 +244 244 244 +148 176 194 +86 108 134 +51 60 87 diff --git a/source/game.cpp b/source/game.cpp index 1c89ecc..f310d44 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -116,7 +116,10 @@ void Game::run() render(); } - JA_StopMusic(); + if (mode_ == GameMode::GAME) + { + JA_StopMusic(); + } } // Actualiza el juego, las variables, comprueba la entrada, etc. @@ -704,10 +707,10 @@ void Game::DEMO_checkRoomChange() void Game::keepMusicPlaying() { const std::string music_path = mode_ == GameMode::GAME ? "game.ogg" : "title.ogg"; - + // Si la música no está sonando - if (JA_GetMusicState() == JA_MUSIC_INVALID || JA_GetMusicState() == JA_MUSIC_STOPPED) - { - JA_PlayMusic(Resource::get()->getMusic(music_path)); - } + if (JA_GetMusicState() == JA_MUSIC_INVALID || JA_GetMusicState() == JA_MUSIC_STOPPED) + { + JA_PlayMusic(Resource::get()->getMusic(music_path)); + } } \ No newline at end of file diff --git a/source/logo.cpp b/source/logo.cpp index e129f3b..e37fc1f 100644 --- a/source/logo.cpp +++ b/source/logo.cpp @@ -212,6 +212,7 @@ void Logo::update() // Gestiona el color de las texturas updateTextureColors(); + // Actualiza el objeto Screen Screen::get()->update(); // Comprueba si ha terminado el logo @@ -243,9 +244,6 @@ void Logo::render() // Bucle para el logo del juego void Logo::run() { - // Detiene la música - JA_StopMusic(); - while (options.section.section == Section::LOGO) { update();