From 81b4de060120de6f56506af8a2ab19633741039b Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Mon, 30 Jun 2025 17:38:14 +0200 Subject: [PATCH] Eliminat controllers.png --- data/gfx/controllers/controllers.png | Bin 799 -> 0 bytes source/director.cpp | 188 ++++++++++++--------------- 2 files changed, 85 insertions(+), 103 deletions(-) delete mode 100644 data/gfx/controllers/controllers.png diff --git a/data/gfx/controllers/controllers.png b/data/gfx/controllers/controllers.png deleted file mode 100644 index e8775b5213916d8f6f044de572003b6def136c3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 799 zcmV+)1K|9LP)Px%*-1n}RA_}vIue9`z-od}3fF~T)HtT>{69Vr#R-kGdH_?=Q}AmqXEIr&c2=7nc25{x)KPo z+1YuL`mfH9OH%(5UtA#z(k+~eDG;_fY(XqKzGzax24DD(vm-LF?e;(&YYW8VSD)zB zy+Nu63w)30{lS+);dwmM7S5vZWj;9YJqUacTB8~HVZYA7Ql3SMO`3Qu5?@i3!1tip zsD;X8Mh0Sk;Cr#%@Y09Fsw_HQXGa!9_DjN?d@}+(v(G&6Wfc%59{_IF9kH#B+3f5* zWnqHXfY;g7Bak15NknB^ejMeAFX1B8-QOC`#KBkyclQr57T`|0lNF*5>rCEMcm(FC9ohMGZQ<&@=FZqv- z08SYy6JXm!Dcjv`qHk@zBl^X~Z=#7C`V{(m0f(69 zX9ZyM&kHK((16+S%|?yHC~v!4b?BWUrCm3FS-ngg9G*t!#;`t(iUBFK*{H$6;b{cE zIzKLD`Dg4k;IVBxbFD^CSKhMruSgoKZ!}-W3%Gd_9-5N zG7tZ@ZwLRgy@CxKq@z0CZwsW#6fcpi_-~iLh`upL|7!fyz9QI{AA@qn7fr;){OixD dMaLIO{sPadd(prefix + "/data/sound/stage_change.wav", AssetType::SOUND); Asset::get()->add(prefix + "/data/sound/tabe.wav", AssetType::SOUND); Asset::get()->add(prefix + "/data/sound/title.wav", AssetType::SOUND); + Asset::get()->add(prefix + "/data/sound/voice_byebye.wav", AssetType::SOUND); Asset::get()->add(prefix + "/data/sound/voice_coffee.wav", AssetType::SOUND); Asset::get()->add(prefix + "/data/sound/voice_get_ready.wav", AssetType::SOUND); Asset::get()->add(prefix + "/data/sound/voice_no.wav", AssetType::SOUND); @@ -320,121 +321,102 @@ void Director::setFileList() Asset::get()->add(prefix + "/data/shaders/crtpi_256.glsl", AssetType::DATA); Asset::get()->add(prefix + "/data/shaders/crtpi_240.glsl", AssetType::DATA); - // Texturas + // Texturas - Balloons + Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.ani", AssetType::ANIMATION); - { // Controllers - Asset::get()->add(prefix + "/data/gfx/controllers/controllers.png", AssetType::BITMAP); - } + // Texturas - Explosiones + Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.ani", AssetType::ANIMATION); - { // Balloons - Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.ani", AssetType::ANIMATION); - } + // Texturas - Power Ball + Asset::get()->add(prefix + "/data/gfx/balloon/powerball.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/balloon/powerball.ani", AssetType::ANIMATION); - { // Explosions - Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.ani", AssetType::ANIMATION); - } + // Texturas - Bala + Asset::get()->add(prefix + "/data/gfx/bullet/bullet.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/bullet/bullet.ani", AssetType::ANIMATION); - { // Power Ball - Asset::get()->add(prefix + "/data/gfx/balloon/powerball.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/balloon/powerball.ani", AssetType::ANIMATION); - } + // Texturas - Tabe + Asset::get()->add(prefix + "/data/gfx/tabe/tabe.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/tabe/tabe.ani", AssetType::ANIMATION); - { // Bala - Asset::get()->add(prefix + "/data/gfx/bullet/bullet.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/bullet/bullet.ani", AssetType::ANIMATION); - } + // Texturas - Juego + Asset::get()->add(prefix + "/data/gfx/game/game_buildings.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/game/game_clouds1.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/game/game_clouds2.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/game/game_grass.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/game/game_power_meter.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/game/game_sky_colors.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/game/game_sun.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/game/game_moon.png", AssetType::BITMAP); - { // Tabe - Asset::get()->add(prefix + "/data/gfx/tabe/tabe.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/tabe/tabe.ani", AssetType::ANIMATION); - } + // Texturas - Intro + Asset::get()->add(prefix + "/data/gfx/intro/intro1.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/intro/intro2.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/intro/intro3.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/intro/intro4.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/intro/intro5.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/intro/intro6.png", AssetType::BITMAP); - { // Juego - Asset::get()->add(prefix + "/data/gfx/game/game_buildings.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/game/game_clouds1.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/game/game_clouds2.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/game/game_grass.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/game/game_power_meter.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/game/game_sky_colors.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/game/game_sun.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/game/game_moon.png", AssetType::BITMAP); - } + // Texturas - Logo + Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames_mini.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/logo/logo_since_1998.png", AssetType::BITMAP); - { // Intro - Asset::get()->add(prefix + "/data/gfx/intro/intro1.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/intro/intro2.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/intro/intro3.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/intro/intro4.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/intro/intro5.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/intro/intro6.png", AssetType::BITMAP); - } + // Texturas - Items + Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/item/item_clock.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/item/item_clock.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/item/item_coffee.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/item/item_coffee.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/item/item_debian.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/item/item_debian.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.ani", AssetType::ANIMATION); - { // Logo - Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames_mini.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/logo/logo_since_1998.png", AssetType::BITMAP); - } + // Texturas - Titulo + Asset::get()->add(prefix + "/data/gfx/title/title_bg_tile.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/title/title_coffee.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/title/title_crisis.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/title/title_arcade_edition.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/title/title_dust.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/title/title_dust.ani", AssetType::ANIMATION); - { // Items - Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/item/item_clock.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/item/item_clock.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/item/item_coffee.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/item/item_coffee.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/item/item_debian.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/item/item_debian.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.ani", AssetType::ANIMATION); - } + // Texturas - Jugador 1 + Asset::get()->add(prefix + "/data/gfx/player/player1.gif", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/player/player1_1_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player1_2_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player1_invencible_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player1_power.png", AssetType::BITMAP); - { // Titulo - Asset::get()->add(prefix + "/data/gfx/title/title_bg_tile.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/title/title_coffee.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/title/title_crisis.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/title/title_arcade_edition.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/title/title_dust.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/title/title_dust.ani", AssetType::ANIMATION); - } + // Texturas - Jugador 2 + Asset::get()->add(prefix + "/data/gfx/player/player2.gif", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/gfx/player/player2_1_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player2_2_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player2_invencible_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player2_power.png", AssetType::BITMAP); - { // Jugador 1 - Asset::get()->add(prefix + "/data/gfx/player/player1.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/player/player1_1_coffee_palette.gif", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player1_2_coffee_palette.gif", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player1_invencible_palette.gif", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player1_power.png", AssetType::BITMAP); - } - - { // Jugador 2 - Asset::get()->add(prefix + "/data/gfx/player/player2.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/player/player2_1_coffee_palette.gif", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player2_2_coffee_palette.gif", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player2_invencible_palette.gif", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player2_power.png", AssetType::BITMAP); - } - - { // Animaciones del jugador - Asset::get()->add(prefix + "/data/gfx/player/player.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/gfx/player/player_power.ani", AssetType::ANIMATION); - } + // Animaciones del jugador + Asset::get()->add(prefix + "/data/gfx/player/player.ani", AssetType::ANIMATION); + Asset::get()->add(prefix + "/data/gfx/player/player_power.ani", AssetType::ANIMATION); // Fuentes de texto Asset::get()->add(prefix + "/data/font/8bithud.png", AssetType::BITMAP);