singletoning

This commit is contained in:
2025-02-21 18:03:09 +01:00
parent debcc3409e
commit 5f68c6256f
8 changed files with 601 additions and 563 deletions

View File

@@ -53,6 +53,7 @@ Director::Director(int argc, const char *argv[])
#ifdef DEBUG
section->name = SECTION_TITLE;
#endif
Asset::init(argv[0]); // Crea el objeto que controla los ficheros de recursos
// Crea e inicializa las opciones del programa
initOptions();
@@ -69,8 +70,7 @@ Director::Director(int argc, const char *argv[])
#endif
// Crea el objeto que controla los ficheros de recursos
asset = new Asset(executablePath);
asset->setVerbose(options->console);
Asset::get()->setVerbose(options->console);
// Si falta algún fichero no inicia el programa
if (!setFileList())
@@ -88,13 +88,13 @@ Director::Director(int argc, const char *argv[])
initJailAudio();
// Crea los objetos
resource = new Resource(renderer, asset, options);
input = new Input(asset->get("gamecontrollerdb.txt"));
resource = new Resource(renderer, Asset::get(), options);
input = new Input(Asset::get()->get("gamecontrollerdb.txt"));
initInput();
screen = new Screen(window, renderer, asset, options);
screen = new Screen(window, renderer, Asset::get(), options);
screen->setBorderColor(borderColor);
debug = new Debug(renderer, screen, asset);
music = JA_LoadMusic(asset->get("title.ogg").c_str());
debug = new Debug(renderer, screen, Asset::get());
music = JA_LoadMusic(Asset::get()->get("title.ogg").c_str());
}
Director::~Director()
@@ -105,7 +105,6 @@ Director::~Director()
// Libera la memoria
delete section;
delete options;
delete asset;
delete input;
delete screen;
delete debug;
@@ -217,7 +216,7 @@ bool Director::loadConfig()
// Variables para manejar el fichero
std::string line;
std::ifstream file(asset->get("config.txt"));
std::ifstream file(Asset::get()->get("config.txt"));
// Si el fichero se puede abrir
if (file.good())
@@ -305,20 +304,20 @@ bool Director::saveConfig()
bool success = true;
// Crea y abre el fichero de texto
std::ofstream file(asset->get("config.txt"));
std::ofstream file(Asset::get()->get("config.txt"));
if (file.good())
{
if (options->console)
{
std::cout << asset->get("config.txt") << " open for writing" << std::endl;
std::cout << Asset::get()->get("config.txt") << " open for writing" << std::endl;
}
}
else
{
if (options->console)
{
std::cout << asset->get("config.txt") << " can't be opened" << std::endl;
std::cout << Asset::get()->get("config.txt") << " can't be opened" << std::endl;
}
}
@@ -1367,354 +1366,354 @@ bool Director::setFileList()
#endif
// Texto
asset->add(prefix + "/data/font/smb2.png", t_font);
asset->add(prefix + "/data/font/smb2.txt", t_font);
asset->add(prefix + "/data/font/debug.png", t_font);
asset->add(prefix + "/data/font/debug.txt", t_font);
asset->add(prefix + "/data/font/gauntlet.png", t_font);
asset->add(prefix + "/data/font/gauntlet.txt", t_font);
asset->add(prefix + "/data/font/subatomic.png", t_font);
asset->add(prefix + "/data/font/subatomic.txt", t_font);
Asset::get()->add(prefix + "/data/font/smb2.png", t_font);
Asset::get()->add(prefix + "/data/font/smb2.txt", t_font);
Asset::get()->add(prefix + "/data/font/debug.png", t_font);
Asset::get()->add(prefix + "/data/font/debug.txt", t_font);
Asset::get()->add(prefix + "/data/font/gauntlet.png", t_font);
Asset::get()->add(prefix + "/data/font/gauntlet.txt", t_font);
Asset::get()->add(prefix + "/data/font/subatomic.png", t_font);
Asset::get()->add(prefix + "/data/font/subatomic.txt", t_font);
// Shaders
asset->add(prefix + "/data/shaders/crtpi_192.glsl", t_data);
asset->add(prefix + "/data/shaders/crtpi_240.glsl", t_data);
Asset::get()->add(prefix + "/data/shaders/crtpi_192.glsl", t_data);
Asset::get()->add(prefix + "/data/shaders/crtpi_240.glsl", t_data);
// Datos
asset->add(prefix + "/data/input/gamecontrollerdb.txt", t_data);
Asset::get()->add(prefix + "/data/input/gamecontrollerdb.txt", t_data);
// Ficheros de sistema
asset->add(systemFolder + "/config.txt", t_data, false, true);
asset->add(systemFolder + "/stats_buffer.csv", t_data, false, true);
asset->add(systemFolder + "/stats.csv", t_data, false, true);
asset->add(systemFolder + "/cheevos.bin", t_data, false, true);
Asset::get()->add(systemFolder + "/config.txt", t_data, false, true);
Asset::get()->add(systemFolder + "/stats_buffer.csv", t_data, false, true);
Asset::get()->add(systemFolder + "/stats.csv", t_data, false, true);
Asset::get()->add(systemFolder + "/cheevos.bin", t_data, false, true);
// Notificaciones
asset->add(prefix + "/data/notifications/notify.png", t_bitmap);
Asset::get()->add(prefix + "/data/notifications/notify.png", t_bitmap);
// Habitaciones
asset->add(prefix + "/data/room/01.room", t_room);
asset->add(prefix + "/data/room/02.room", t_room);
asset->add(prefix + "/data/room/03.room", t_room);
asset->add(prefix + "/data/room/04.room", t_room);
asset->add(prefix + "/data/room/05.room", t_room);
asset->add(prefix + "/data/room/06.room", t_room);
asset->add(prefix + "/data/room/07.room", t_room);
asset->add(prefix + "/data/room/08.room", t_room);
asset->add(prefix + "/data/room/09.room", t_room);
asset->add(prefix + "/data/room/10.room", t_room);
asset->add(prefix + "/data/room/11.room", t_room);
asset->add(prefix + "/data/room/12.room", t_room);
asset->add(prefix + "/data/room/13.room", t_room);
asset->add(prefix + "/data/room/14.room", t_room);
asset->add(prefix + "/data/room/15.room", t_room);
asset->add(prefix + "/data/room/16.room", t_room);
asset->add(prefix + "/data/room/17.room", t_room);
asset->add(prefix + "/data/room/18.room", t_room);
asset->add(prefix + "/data/room/19.room", t_room);
asset->add(prefix + "/data/room/20.room", t_room);
asset->add(prefix + "/data/room/21.room", t_room);
asset->add(prefix + "/data/room/22.room", t_room);
asset->add(prefix + "/data/room/23.room", t_room);
asset->add(prefix + "/data/room/24.room", t_room);
asset->add(prefix + "/data/room/25.room", t_room);
asset->add(prefix + "/data/room/26.room", t_room);
asset->add(prefix + "/data/room/27.room", t_room);
asset->add(prefix + "/data/room/28.room", t_room);
asset->add(prefix + "/data/room/29.room", t_room);
asset->add(prefix + "/data/room/30.room", t_room);
asset->add(prefix + "/data/room/31.room", t_room);
asset->add(prefix + "/data/room/32.room", t_room);
asset->add(prefix + "/data/room/33.room", t_room);
asset->add(prefix + "/data/room/34.room", t_room);
asset->add(prefix + "/data/room/35.room", t_room);
asset->add(prefix + "/data/room/36.room", t_room);
asset->add(prefix + "/data/room/37.room", t_room);
asset->add(prefix + "/data/room/38.room", t_room);
asset->add(prefix + "/data/room/39.room", t_room);
asset->add(prefix + "/data/room/40.room", t_room);
asset->add(prefix + "/data/room/41.room", t_room);
asset->add(prefix + "/data/room/42.room", t_room);
asset->add(prefix + "/data/room/43.room", t_room);
asset->add(prefix + "/data/room/44.room", t_room);
asset->add(prefix + "/data/room/45.room", t_room);
asset->add(prefix + "/data/room/46.room", t_room);
asset->add(prefix + "/data/room/47.room", t_room);
asset->add(prefix + "/data/room/48.room", t_room);
asset->add(prefix + "/data/room/49.room", t_room);
asset->add(prefix + "/data/room/50.room", t_room);
asset->add(prefix + "/data/room/51.room", t_room);
asset->add(prefix + "/data/room/52.room", t_room);
asset->add(prefix + "/data/room/53.room", t_room);
asset->add(prefix + "/data/room/54.room", t_room);
asset->add(prefix + "/data/room/55.room", t_room);
asset->add(prefix + "/data/room/56.room", t_room);
asset->add(prefix + "/data/room/57.room", t_room);
asset->add(prefix + "/data/room/58.room", t_room);
asset->add(prefix + "/data/room/59.room", t_room);
asset->add(prefix + "/data/room/60.room", t_room);
Asset::get()->add(prefix + "/data/room/01.room", t_room);
Asset::get()->add(prefix + "/data/room/02.room", t_room);
Asset::get()->add(prefix + "/data/room/03.room", t_room);
Asset::get()->add(prefix + "/data/room/04.room", t_room);
Asset::get()->add(prefix + "/data/room/05.room", t_room);
Asset::get()->add(prefix + "/data/room/06.room", t_room);
Asset::get()->add(prefix + "/data/room/07.room", t_room);
Asset::get()->add(prefix + "/data/room/08.room", t_room);
Asset::get()->add(prefix + "/data/room/09.room", t_room);
Asset::get()->add(prefix + "/data/room/10.room", t_room);
Asset::get()->add(prefix + "/data/room/11.room", t_room);
Asset::get()->add(prefix + "/data/room/12.room", t_room);
Asset::get()->add(prefix + "/data/room/13.room", t_room);
Asset::get()->add(prefix + "/data/room/14.room", t_room);
Asset::get()->add(prefix + "/data/room/15.room", t_room);
Asset::get()->add(prefix + "/data/room/16.room", t_room);
Asset::get()->add(prefix + "/data/room/17.room", t_room);
Asset::get()->add(prefix + "/data/room/18.room", t_room);
Asset::get()->add(prefix + "/data/room/19.room", t_room);
Asset::get()->add(prefix + "/data/room/20.room", t_room);
Asset::get()->add(prefix + "/data/room/21.room", t_room);
Asset::get()->add(prefix + "/data/room/22.room", t_room);
Asset::get()->add(prefix + "/data/room/23.room", t_room);
Asset::get()->add(prefix + "/data/room/24.room", t_room);
Asset::get()->add(prefix + "/data/room/25.room", t_room);
Asset::get()->add(prefix + "/data/room/26.room", t_room);
Asset::get()->add(prefix + "/data/room/27.room", t_room);
Asset::get()->add(prefix + "/data/room/28.room", t_room);
Asset::get()->add(prefix + "/data/room/29.room", t_room);
Asset::get()->add(prefix + "/data/room/30.room", t_room);
Asset::get()->add(prefix + "/data/room/31.room", t_room);
Asset::get()->add(prefix + "/data/room/32.room", t_room);
Asset::get()->add(prefix + "/data/room/33.room", t_room);
Asset::get()->add(prefix + "/data/room/34.room", t_room);
Asset::get()->add(prefix + "/data/room/35.room", t_room);
Asset::get()->add(prefix + "/data/room/36.room", t_room);
Asset::get()->add(prefix + "/data/room/37.room", t_room);
Asset::get()->add(prefix + "/data/room/38.room", t_room);
Asset::get()->add(prefix + "/data/room/39.room", t_room);
Asset::get()->add(prefix + "/data/room/40.room", t_room);
Asset::get()->add(prefix + "/data/room/41.room", t_room);
Asset::get()->add(prefix + "/data/room/42.room", t_room);
Asset::get()->add(prefix + "/data/room/43.room", t_room);
Asset::get()->add(prefix + "/data/room/44.room", t_room);
Asset::get()->add(prefix + "/data/room/45.room", t_room);
Asset::get()->add(prefix + "/data/room/46.room", t_room);
Asset::get()->add(prefix + "/data/room/47.room", t_room);
Asset::get()->add(prefix + "/data/room/48.room", t_room);
Asset::get()->add(prefix + "/data/room/49.room", t_room);
Asset::get()->add(prefix + "/data/room/50.room", t_room);
Asset::get()->add(prefix + "/data/room/51.room", t_room);
Asset::get()->add(prefix + "/data/room/52.room", t_room);
Asset::get()->add(prefix + "/data/room/53.room", t_room);
Asset::get()->add(prefix + "/data/room/54.room", t_room);
Asset::get()->add(prefix + "/data/room/55.room", t_room);
Asset::get()->add(prefix + "/data/room/56.room", t_room);
Asset::get()->add(prefix + "/data/room/57.room", t_room);
Asset::get()->add(prefix + "/data/room/58.room", t_room);
Asset::get()->add(prefix + "/data/room/59.room", t_room);
Asset::get()->add(prefix + "/data/room/60.room", t_room);
// Tilemaps
asset->add(prefix + "/data/room/01.tmx", t_room);
asset->add(prefix + "/data/room/02.tmx", t_room);
asset->add(prefix + "/data/room/03.tmx", t_room);
asset->add(prefix + "/data/room/04.tmx", t_room);
asset->add(prefix + "/data/room/05.tmx", t_room);
asset->add(prefix + "/data/room/06.tmx", t_room);
asset->add(prefix + "/data/room/07.tmx", t_room);
asset->add(prefix + "/data/room/08.tmx", t_room);
asset->add(prefix + "/data/room/09.tmx", t_room);
asset->add(prefix + "/data/room/10.tmx", t_room);
asset->add(prefix + "/data/room/11.tmx", t_room);
asset->add(prefix + "/data/room/12.tmx", t_room);
asset->add(prefix + "/data/room/13.tmx", t_room);
asset->add(prefix + "/data/room/14.tmx", t_room);
asset->add(prefix + "/data/room/15.tmx", t_room);
asset->add(prefix + "/data/room/16.tmx", t_room);
asset->add(prefix + "/data/room/17.tmx", t_room);
asset->add(prefix + "/data/room/18.tmx", t_room);
asset->add(prefix + "/data/room/19.tmx", t_room);
asset->add(prefix + "/data/room/20.tmx", t_room);
asset->add(prefix + "/data/room/21.tmx", t_room);
asset->add(prefix + "/data/room/22.tmx", t_room);
asset->add(prefix + "/data/room/23.tmx", t_room);
asset->add(prefix + "/data/room/24.tmx", t_room);
asset->add(prefix + "/data/room/25.tmx", t_room);
asset->add(prefix + "/data/room/26.tmx", t_room);
asset->add(prefix + "/data/room/27.tmx", t_room);
asset->add(prefix + "/data/room/28.tmx", t_room);
asset->add(prefix + "/data/room/29.tmx", t_room);
asset->add(prefix + "/data/room/30.tmx", t_room);
asset->add(prefix + "/data/room/31.tmx", t_room);
asset->add(prefix + "/data/room/32.tmx", t_room);
asset->add(prefix + "/data/room/33.tmx", t_room);
asset->add(prefix + "/data/room/34.tmx", t_room);
asset->add(prefix + "/data/room/35.tmx", t_room);
asset->add(prefix + "/data/room/36.tmx", t_room);
asset->add(prefix + "/data/room/37.tmx", t_room);
asset->add(prefix + "/data/room/38.tmx", t_room);
asset->add(prefix + "/data/room/39.tmx", t_room);
asset->add(prefix + "/data/room/40.tmx", t_room);
asset->add(prefix + "/data/room/41.tmx", t_room);
asset->add(prefix + "/data/room/42.tmx", t_room);
asset->add(prefix + "/data/room/43.tmx", t_room);
asset->add(prefix + "/data/room/44.tmx", t_room);
asset->add(prefix + "/data/room/45.tmx", t_room);
asset->add(prefix + "/data/room/46.tmx", t_room);
asset->add(prefix + "/data/room/47.tmx", t_room);
asset->add(prefix + "/data/room/48.tmx", t_room);
asset->add(prefix + "/data/room/49.tmx", t_room);
asset->add(prefix + "/data/room/50.tmx", t_room);
asset->add(prefix + "/data/room/51.tmx", t_room);
asset->add(prefix + "/data/room/52.tmx", t_room);
asset->add(prefix + "/data/room/53.tmx", t_room);
asset->add(prefix + "/data/room/54.tmx", t_room);
asset->add(prefix + "/data/room/55.tmx", t_room);
asset->add(prefix + "/data/room/56.tmx", t_room);
asset->add(prefix + "/data/room/57.tmx", t_room);
asset->add(prefix + "/data/room/58.tmx", t_room);
asset->add(prefix + "/data/room/59.tmx", t_room);
asset->add(prefix + "/data/room/60.tmx", t_room);
Asset::get()->add(prefix + "/data/room/01.tmx", t_room);
Asset::get()->add(prefix + "/data/room/02.tmx", t_room);
Asset::get()->add(prefix + "/data/room/03.tmx", t_room);
Asset::get()->add(prefix + "/data/room/04.tmx", t_room);
Asset::get()->add(prefix + "/data/room/05.tmx", t_room);
Asset::get()->add(prefix + "/data/room/06.tmx", t_room);
Asset::get()->add(prefix + "/data/room/07.tmx", t_room);
Asset::get()->add(prefix + "/data/room/08.tmx", t_room);
Asset::get()->add(prefix + "/data/room/09.tmx", t_room);
Asset::get()->add(prefix + "/data/room/10.tmx", t_room);
Asset::get()->add(prefix + "/data/room/11.tmx", t_room);
Asset::get()->add(prefix + "/data/room/12.tmx", t_room);
Asset::get()->add(prefix + "/data/room/13.tmx", t_room);
Asset::get()->add(prefix + "/data/room/14.tmx", t_room);
Asset::get()->add(prefix + "/data/room/15.tmx", t_room);
Asset::get()->add(prefix + "/data/room/16.tmx", t_room);
Asset::get()->add(prefix + "/data/room/17.tmx", t_room);
Asset::get()->add(prefix + "/data/room/18.tmx", t_room);
Asset::get()->add(prefix + "/data/room/19.tmx", t_room);
Asset::get()->add(prefix + "/data/room/20.tmx", t_room);
Asset::get()->add(prefix + "/data/room/21.tmx", t_room);
Asset::get()->add(prefix + "/data/room/22.tmx", t_room);
Asset::get()->add(prefix + "/data/room/23.tmx", t_room);
Asset::get()->add(prefix + "/data/room/24.tmx", t_room);
Asset::get()->add(prefix + "/data/room/25.tmx", t_room);
Asset::get()->add(prefix + "/data/room/26.tmx", t_room);
Asset::get()->add(prefix + "/data/room/27.tmx", t_room);
Asset::get()->add(prefix + "/data/room/28.tmx", t_room);
Asset::get()->add(prefix + "/data/room/29.tmx", t_room);
Asset::get()->add(prefix + "/data/room/30.tmx", t_room);
Asset::get()->add(prefix + "/data/room/31.tmx", t_room);
Asset::get()->add(prefix + "/data/room/32.tmx", t_room);
Asset::get()->add(prefix + "/data/room/33.tmx", t_room);
Asset::get()->add(prefix + "/data/room/34.tmx", t_room);
Asset::get()->add(prefix + "/data/room/35.tmx", t_room);
Asset::get()->add(prefix + "/data/room/36.tmx", t_room);
Asset::get()->add(prefix + "/data/room/37.tmx", t_room);
Asset::get()->add(prefix + "/data/room/38.tmx", t_room);
Asset::get()->add(prefix + "/data/room/39.tmx", t_room);
Asset::get()->add(prefix + "/data/room/40.tmx", t_room);
Asset::get()->add(prefix + "/data/room/41.tmx", t_room);
Asset::get()->add(prefix + "/data/room/42.tmx", t_room);
Asset::get()->add(prefix + "/data/room/43.tmx", t_room);
Asset::get()->add(prefix + "/data/room/44.tmx", t_room);
Asset::get()->add(prefix + "/data/room/45.tmx", t_room);
Asset::get()->add(prefix + "/data/room/46.tmx", t_room);
Asset::get()->add(prefix + "/data/room/47.tmx", t_room);
Asset::get()->add(prefix + "/data/room/48.tmx", t_room);
Asset::get()->add(prefix + "/data/room/49.tmx", t_room);
Asset::get()->add(prefix + "/data/room/50.tmx", t_room);
Asset::get()->add(prefix + "/data/room/51.tmx", t_room);
Asset::get()->add(prefix + "/data/room/52.tmx", t_room);
Asset::get()->add(prefix + "/data/room/53.tmx", t_room);
Asset::get()->add(prefix + "/data/room/54.tmx", t_room);
Asset::get()->add(prefix + "/data/room/55.tmx", t_room);
Asset::get()->add(prefix + "/data/room/56.tmx", t_room);
Asset::get()->add(prefix + "/data/room/57.tmx", t_room);
Asset::get()->add(prefix + "/data/room/58.tmx", t_room);
Asset::get()->add(prefix + "/data/room/59.tmx", t_room);
Asset::get()->add(prefix + "/data/room/60.tmx", t_room);
// Tilesets
asset->add(prefix + "/data/tilesets/standard.png", t_bitmap);
asset->add(prefix + "/data/tilesets/standard_zxarne.png", t_bitmap);
Asset::get()->add(prefix + "/data/tilesets/standard.png", t_bitmap);
Asset::get()->add(prefix + "/data/tilesets/standard_zxarne.png", t_bitmap);
// Enemigos
asset->add(prefix + "/data/enemies/abad_bell.ani", t_data);
asset->add(prefix + "/data/enemies/abad_bell.png", t_bitmap);
asset->add(prefix + "/data/enemies/abad.ani", t_data);
asset->add(prefix + "/data/enemies/abad.png", t_bitmap);
asset->add(prefix + "/data/enemies/amstrad_cs.ani", t_data);
asset->add(prefix + "/data/enemies/amstrad_cs.png", t_bitmap);
asset->add(prefix + "/data/enemies/flying_arounder.ani", t_data);
asset->add(prefix + "/data/enemies/flying_arounder.png", t_bitmap);
asset->add(prefix + "/data/enemies/stopped_arounder.ani", t_data);
asset->add(prefix + "/data/enemies/stopped_arounder.png", t_bitmap);
asset->add(prefix + "/data/enemies/walking_arounder.ani", t_data);
asset->add(prefix + "/data/enemies/walking_arounder.png", t_bitmap);
asset->add(prefix + "/data/enemies/arounders_door.ani", t_data);
asset->add(prefix + "/data/enemies/arounders_door.png", t_bitmap);
asset->add(prefix + "/data/enemies/arounders_machine.ani", t_data);
asset->add(prefix + "/data/enemies/arounders_machine.png", t_bitmap);
asset->add(prefix + "/data/enemies/bat.ani", t_data);
asset->add(prefix + "/data/enemies/bat.png", t_bitmap);
asset->add(prefix + "/data/enemies/batman_bell.ani", t_data);
asset->add(prefix + "/data/enemies/batman_bell.png", t_bitmap);
asset->add(prefix + "/data/enemies/batman_fire.ani", t_data);
asset->add(prefix + "/data/enemies/batman_fire.png", t_bitmap);
asset->add(prefix + "/data/enemies/batman.ani", t_data);
asset->add(prefix + "/data/enemies/batman.png", t_bitmap);
asset->add(prefix + "/data/enemies/bell.ani", t_data);
asset->add(prefix + "/data/enemies/bell.png", t_bitmap);
asset->add(prefix + "/data/enemies/bin.ani", t_data);
asset->add(prefix + "/data/enemies/bin.png", t_bitmap);
asset->add(prefix + "/data/enemies/bird.ani", t_data);
asset->add(prefix + "/data/enemies/bird.png", t_bitmap);
asset->add(prefix + "/data/enemies/breakout.ani", t_data);
asset->add(prefix + "/data/enemies/breakout.png", t_bitmap);
asset->add(prefix + "/data/enemies/bry.ani", t_data);
asset->add(prefix + "/data/enemies/bry.png", t_bitmap);
asset->add(prefix + "/data/enemies/chip.ani", t_data);
asset->add(prefix + "/data/enemies/chip.png", t_bitmap);
asset->add(prefix + "/data/enemies/code.ani", t_data);
asset->add(prefix + "/data/enemies/code.png", t_bitmap);
asset->add(prefix + "/data/enemies/congo.ani", t_data);
asset->add(prefix + "/data/enemies/congo.png", t_bitmap);
asset->add(prefix + "/data/enemies/crosshair.ani", t_data);
asset->add(prefix + "/data/enemies/crosshair.png", t_bitmap);
asset->add(prefix + "/data/enemies/demon.ani", t_data);
asset->add(prefix + "/data/enemies/demon.png", t_bitmap);
asset->add(prefix + "/data/enemies/dimallas.ani", t_data);
asset->add(prefix + "/data/enemies/dimallas.png", t_bitmap);
asset->add(prefix + "/data/enemies/floppy.ani", t_data);
asset->add(prefix + "/data/enemies/floppy.png", t_bitmap);
asset->add(prefix + "/data/enemies/dong.ani", t_data);
asset->add(prefix + "/data/enemies/dong.png", t_bitmap);
asset->add(prefix + "/data/enemies/guitar.ani", t_data);
asset->add(prefix + "/data/enemies/guitar.png", t_bitmap);
asset->add(prefix + "/data/enemies/heavy.ani", t_data);
asset->add(prefix + "/data/enemies/heavy.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer_#1.ani", t_data);
asset->add(prefix + "/data/enemies/jailer_#1.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer_#2.ani", t_data);
asset->add(prefix + "/data/enemies/jailer_#2.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer_#3.ani", t_data);
asset->add(prefix + "/data/enemies/jailer_#3.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailbattle_alien.ani", t_data);
asset->add(prefix + "/data/enemies/jailbattle_alien.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailbattle_human.ani", t_data);
asset->add(prefix + "/data/enemies/jailbattle_human.png", t_bitmap);
asset->add(prefix + "/data/enemies/jeannine.ani", t_data);
asset->add(prefix + "/data/enemies/jeannine.png", t_bitmap);
asset->add(prefix + "/data/enemies/lamp.ani", t_data);
asset->add(prefix + "/data/enemies/lamp.png", t_bitmap);
asset->add(prefix + "/data/enemies/lord_abad.ani", t_data);
asset->add(prefix + "/data/enemies/lord_abad.png", t_bitmap);
asset->add(prefix + "/data/enemies/matatunos.ani", t_data);
asset->add(prefix + "/data/enemies/matatunos.png", t_bitmap);
asset->add(prefix + "/data/enemies/mummy.ani", t_data);
asset->add(prefix + "/data/enemies/mummy.png", t_bitmap);
asset->add(prefix + "/data/enemies/paco.ani", t_data);
asset->add(prefix + "/data/enemies/paco.png", t_bitmap);
asset->add(prefix + "/data/enemies/elsa.ani", t_data);
asset->add(prefix + "/data/enemies/elsa.png", t_bitmap);
asset->add(prefix + "/data/enemies/qvoid.ani", t_data);
asset->add(prefix + "/data/enemies/qvoid.png", t_bitmap);
asset->add(prefix + "/data/enemies/robot.ani", t_data);
asset->add(prefix + "/data/enemies/robot.png", t_bitmap);
asset->add(prefix + "/data/enemies/sam.ani", t_data);
asset->add(prefix + "/data/enemies/sam.png", t_bitmap);
asset->add(prefix + "/data/enemies/shock.ani", t_data);
asset->add(prefix + "/data/enemies/shock.png", t_bitmap);
asset->add(prefix + "/data/enemies/sigmasua.ani", t_data);
asset->add(prefix + "/data/enemies/sigmasua.png", t_bitmap);
asset->add(prefix + "/data/enemies/spark.ani", t_data);
asset->add(prefix + "/data/enemies/spark.png", t_bitmap);
asset->add(prefix + "/data/enemies/special/aerojailer.ani", t_data);
asset->add(prefix + "/data/enemies/special/aerojailer.png", t_bitmap);
asset->add(prefix + "/data/enemies/special/arounder.ani", t_data);
asset->add(prefix + "/data/enemies/special/arounder.png", t_bitmap);
asset->add(prefix + "/data/enemies/special/pepe_rosita_job.ani", t_data);
asset->add(prefix + "/data/enemies/special/pepe_rosita_job.png", t_bitmap);
asset->add(prefix + "/data/enemies/special/shooting_star.ani", t_data);
asset->add(prefix + "/data/enemies/special/shooting_star.png", t_bitmap);
asset->add(prefix + "/data/enemies/spider.ani", t_data);
asset->add(prefix + "/data/enemies/spider.png", t_bitmap);
asset->add(prefix + "/data/enemies/tree_thing.ani", t_data);
asset->add(prefix + "/data/enemies/tree_thing.png", t_bitmap);
asset->add(prefix + "/data/enemies/tuno.ani", t_data);
asset->add(prefix + "/data/enemies/tuno.png", t_bitmap);
asset->add(prefix + "/data/enemies/tv_panel.ani", t_data);
asset->add(prefix + "/data/enemies/tv_panel.png", t_bitmap);
asset->add(prefix + "/data/enemies/tv.ani", t_data);
asset->add(prefix + "/data/enemies/tv.png", t_bitmap);
asset->add(prefix + "/data/enemies/upv_student.ani", t_data);
asset->add(prefix + "/data/enemies/upv_student.png", t_bitmap);
asset->add(prefix + "/data/enemies/wave.ani", t_data);
asset->add(prefix + "/data/enemies/wave.png", t_bitmap);
asset->add(prefix + "/data/enemies/z80.ani", t_data);
asset->add(prefix + "/data/enemies/z80.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/abad_bell.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/abad_bell.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/abad.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/abad.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/amstrad_cs.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/amstrad_cs.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/flying_arounder.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/flying_arounder.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/stopped_arounder.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/stopped_arounder.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/walking_arounder.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/walking_arounder.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/arounders_door.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/arounders_door.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/arounders_machine.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/arounders_machine.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/bat.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/bat.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/batman_bell.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/batman_bell.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/batman_fire.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/batman_fire.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/batman.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/batman.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/bell.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/bell.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/bin.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/bin.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/bird.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/bird.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/breakout.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/breakout.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/bry.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/bry.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/chip.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/chip.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/code.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/code.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/congo.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/congo.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/crosshair.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/crosshair.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/demon.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/demon.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/dimallas.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/dimallas.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/floppy.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/floppy.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/dong.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/dong.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/guitar.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/guitar.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/heavy.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/heavy.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/jailer_#1.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/jailer_#1.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/jailer_#2.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/jailer_#2.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/jailer_#3.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/jailer_#3.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/jailbattle_alien.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/jailbattle_alien.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/jailbattle_human.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/jailbattle_human.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/jeannine.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/jeannine.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/lamp.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/lamp.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/lord_abad.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/lord_abad.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/matatunos.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/matatunos.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/mummy.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/mummy.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/paco.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/paco.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/elsa.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/elsa.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/qvoid.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/qvoid.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/robot.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/robot.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/sam.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/sam.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/shock.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/shock.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/sigmasua.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/sigmasua.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/spark.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/spark.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/special/aerojailer.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/special/aerojailer.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/special/arounder.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/special/arounder.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/special/pepe_rosita_job.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/special/pepe_rosita_job.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/special/shooting_star.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/special/shooting_star.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/spider.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/spider.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/tree_thing.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/tree_thing.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/tuno.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/tuno.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/tv_panel.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/tv_panel.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/tv.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/tv.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/upv_student.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/upv_student.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/wave.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/wave.png", t_bitmap);
Asset::get()->add(prefix + "/data/enemies/z80.ani", t_data);
Asset::get()->add(prefix + "/data/enemies/z80.png", t_bitmap);
// Jugador
asset->add(prefix + "/data/player/player.png", t_bitmap);
asset->add(prefix + "/data/player/player.ani", t_data);
asset->add(prefix + "/data/player/player2.png", t_bitmap);
asset->add(prefix + "/data/player/player2.ani", t_data);
asset->add(prefix + "/data/player/player_game_over.png", t_bitmap);
asset->add(prefix + "/data/player/player_game_over.ani", t_data);
Asset::get()->add(prefix + "/data/player/player.png", t_bitmap);
Asset::get()->add(prefix + "/data/player/player.ani", t_data);
Asset::get()->add(prefix + "/data/player/player2.png", t_bitmap);
Asset::get()->add(prefix + "/data/player/player2.ani", t_data);
Asset::get()->add(prefix + "/data/player/player_game_over.png", t_bitmap);
Asset::get()->add(prefix + "/data/player/player_game_over.ani", t_data);
// Items
asset->add(prefix + "/data/items/items.png", t_bitmap);
Asset::get()->add(prefix + "/data/items/items.png", t_bitmap);
// Musicas
asset->add(prefix + "/data/music/title.ogg", t_music);
asset->add(prefix + "/data/music/game.ogg", t_music);
asset->add(prefix + "/data/music/loading_sound1.ogg", t_music);
asset->add(prefix + "/data/music/loading_sound2.ogg", t_music);
asset->add(prefix + "/data/music/loading_sound3.ogg", t_music);
asset->add(prefix + "/data/music/ending1.ogg", t_music);
asset->add(prefix + "/data/music/ending2.ogg", t_music);
asset->add(prefix + "/data/music/game_over.ogg", t_music);
Asset::get()->add(prefix + "/data/music/title.ogg", t_music);
Asset::get()->add(prefix + "/data/music/game.ogg", t_music);
Asset::get()->add(prefix + "/data/music/loading_sound1.ogg", t_music);
Asset::get()->add(prefix + "/data/music/loading_sound2.ogg", t_music);
Asset::get()->add(prefix + "/data/music/loading_sound3.ogg", t_music);
Asset::get()->add(prefix + "/data/music/ending1.ogg", t_music);
Asset::get()->add(prefix + "/data/music/ending2.ogg", t_music);
Asset::get()->add(prefix + "/data/music/game_over.ogg", t_music);
// Efectos de sonido
asset->add(prefix + "/data/sound/item.wav", t_sound);
asset->add(prefix + "/data/sound/death.wav", t_sound);
asset->add(prefix + "/data/sound/jump1.wav", t_sound);
asset->add(prefix + "/data/sound/jump2.wav", t_sound);
asset->add(prefix + "/data/sound/jump3.wav", t_sound);
asset->add(prefix + "/data/sound/jump4.wav", t_sound);
asset->add(prefix + "/data/sound/jump5.wav", t_sound);
asset->add(prefix + "/data/sound/jump6.wav", t_sound);
asset->add(prefix + "/data/sound/jump7.wav", t_sound);
asset->add(prefix + "/data/sound/jump8.wav", t_sound);
asset->add(prefix + "/data/sound/jump9.wav", t_sound);
asset->add(prefix + "/data/sound/jump10.wav", t_sound);
asset->add(prefix + "/data/sound/jump11.wav", t_sound);
asset->add(prefix + "/data/sound/jump12.wav", t_sound);
asset->add(prefix + "/data/sound/jump13.wav", t_sound);
asset->add(prefix + "/data/sound/jump14.wav", t_sound);
asset->add(prefix + "/data/sound/jump15.wav", t_sound);
asset->add(prefix + "/data/sound/jump16.wav", t_sound);
asset->add(prefix + "/data/sound/jump17.wav", t_sound);
asset->add(prefix + "/data/sound/jump18.wav", t_sound);
asset->add(prefix + "/data/sound/jump19.wav", t_sound);
asset->add(prefix + "/data/sound/jump20.wav", t_sound);
asset->add(prefix + "/data/sound/jump21.wav", t_sound);
asset->add(prefix + "/data/sound/jump22.wav", t_sound);
asset->add(prefix + "/data/sound/jump23.wav", t_sound);
asset->add(prefix + "/data/sound/jump24.wav", t_sound);
asset->add(prefix + "/data/sound/notify.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/item.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/death.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump1.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump2.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump3.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump4.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump5.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump6.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump7.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump8.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump9.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump10.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump11.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump12.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump13.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump14.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump15.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump16.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump17.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump18.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump19.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump20.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump21.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump22.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump23.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/jump24.wav", t_sound);
Asset::get()->add(prefix + "/data/sound/notify.wav", t_sound);
// Logo
asset->add(prefix + "/data/logo/jailgames.png", t_bitmap);
asset->add(prefix + "/data/logo/since_1998.png", t_bitmap);
Asset::get()->add(prefix + "/data/logo/jailgames.png", t_bitmap);
Asset::get()->add(prefix + "/data/logo/since_1998.png", t_bitmap);
// Intro
asset->add(prefix + "/data/title/loading_screen_bn.png", t_bitmap);
asset->add(prefix + "/data/title/loading_screen_color.png", t_bitmap);
asset->add(prefix + "/data/title/loading_screen_bn_zxarne.png", t_bitmap);
asset->add(prefix + "/data/title/loading_screen_color_zxarne.png", t_bitmap);
asset->add(prefix + "/data/title/loading_screen_color.gif", t_bitmap);
asset->add(prefix + "/data/title/title_logo.png", t_bitmap);
Asset::get()->add(prefix + "/data/title/loading_screen_bn.png", t_bitmap);
Asset::get()->add(prefix + "/data/title/loading_screen_color.png", t_bitmap);
Asset::get()->add(prefix + "/data/title/loading_screen_bn_zxarne.png", t_bitmap);
Asset::get()->add(prefix + "/data/title/loading_screen_color_zxarne.png", t_bitmap);
Asset::get()->add(prefix + "/data/title/loading_screen_color.gif", t_bitmap);
Asset::get()->add(prefix + "/data/title/title_logo.png", t_bitmap);
// Ending
asset->add(prefix + "/data/ending/ending1.png", t_bitmap);
asset->add(prefix + "/data/ending/ending1_zxarne.png", t_bitmap);
asset->add(prefix + "/data/ending/ending2.png", t_bitmap);
asset->add(prefix + "/data/ending/ending2_zxarne.png", t_bitmap);
asset->add(prefix + "/data/ending/ending3.png", t_bitmap);
asset->add(prefix + "/data/ending/ending3_zxarne.png", t_bitmap);
asset->add(prefix + "/data/ending/ending4.png", t_bitmap);
asset->add(prefix + "/data/ending/ending4_zxarne.png", t_bitmap);
asset->add(prefix + "/data/ending/ending5.png", t_bitmap);
asset->add(prefix + "/data/ending/ending5_zxarne.png", t_bitmap);
Asset::get()->add(prefix + "/data/ending/ending1.png", t_bitmap);
Asset::get()->add(prefix + "/data/ending/ending1_zxarne.png", t_bitmap);
Asset::get()->add(prefix + "/data/ending/ending2.png", t_bitmap);
Asset::get()->add(prefix + "/data/ending/ending2_zxarne.png", t_bitmap);
Asset::get()->add(prefix + "/data/ending/ending3.png", t_bitmap);
Asset::get()->add(prefix + "/data/ending/ending3_zxarne.png", t_bitmap);
Asset::get()->add(prefix + "/data/ending/ending4.png", t_bitmap);
Asset::get()->add(prefix + "/data/ending/ending4_zxarne.png", t_bitmap);
Asset::get()->add(prefix + "/data/ending/ending5.png", t_bitmap);
Asset::get()->add(prefix + "/data/ending/ending5_zxarne.png", t_bitmap);
// Credits
asset->add(prefix + "/data/credits/shine.png", t_bitmap);
asset->add(prefix + "/data/credits/shine.ani", t_bitmap);
Asset::get()->add(prefix + "/data/credits/shine.png", t_bitmap);
Asset::get()->add(prefix + "/data/credits/shine.ani", t_bitmap);
return asset->check();
return Asset::get()->check();
}
// Ejecuta la seccion de juego con el logo
@@ -1725,7 +1724,7 @@ void Director::runLogo()
std::cout << "\n* SECTION: LOGO" << std::endl;
}
loadResources(section);
auto logo = std::make_unique<Logo>(renderer, screen, resource, asset, input, options, section);
auto logo = std::make_unique<Logo>(renderer, screen, resource, Asset::get(), input, options, section);
logo->run();
resource->free();
}
@@ -1738,7 +1737,7 @@ void Director::runLoadingScreen()
std::cout << "\n* SECTION: INTRO" << std::endl;
}
loadResources(section);
auto loadingScreen = std::make_unique<LoadingScreen>(renderer, screen, resource, asset, input, options, section);
auto loadingScreen = std::make_unique<LoadingScreen>(renderer, screen, resource, Asset::get(), input, options, section);
loadingScreen->run();
resource->free();
}
@@ -1755,7 +1754,7 @@ void Director::runTitle()
JA_PlayMusic(music);
}
loadResources(section);
auto title = std::make_unique<Title>(renderer, screen, resource, asset, input, options, section);
auto title = std::make_unique<Title>(renderer, screen, resource, input, options, section);
title->run();
resource->free();
}
@@ -1768,7 +1767,7 @@ void Director::runCredits()
std::cout << "\n* SECTION: CREDITS" << std::endl;
}
loadResources(section);
auto credits = std::make_unique<Credits>(renderer, screen, resource, asset, input, options, section);
auto credits = std::make_unique<Credits>(renderer, screen, resource, Asset::get(), input, options, section);
credits->run();
resource->free();
}
@@ -1781,7 +1780,7 @@ void Director::runDemo()
std::cout << "\n* SECTION: DEMO" << std::endl;
}
loadResources(section);
auto demo = std::make_unique<Demo>(renderer, screen, resource, asset, input, options, section, debug);
auto demo = std::make_unique<Demo>(renderer, screen, resource, Asset::get(), input, options, section, debug);
demo->run();
resource->free();
}
@@ -1794,7 +1793,7 @@ void Director::runEnding()
std::cout << "\n* SECTION: ENDING" << std::endl;
}
loadResources(section);
auto ending = std::make_unique<Ending>(renderer, screen, resource, asset, input, options, section);
auto ending = std::make_unique<Ending>(renderer, screen, resource, Asset::get(), input, options, section);
ending->run();
resource->free();
}
@@ -1807,7 +1806,7 @@ void Director::runEnding2()
std::cout << "\n* SECTION: ENDING2" << std::endl;
}
loadResources(section);
auto ending2 = std::make_unique<Ending2>(renderer, screen, resource, asset, input, options, section);
auto ending2 = std::make_unique<Ending2>(renderer, screen, resource, Asset::get(), input, options, section);
ending2->run();
resource->free();
}
@@ -1820,7 +1819,7 @@ void Director::runGameOver()
std::cout << "\n* SECTION: GAME OVER" << std::endl;
}
loadResources(section);
auto gameOver = std::make_unique<GameOver>(renderer, screen, resource, asset, input, options, section);
auto gameOver = std::make_unique<GameOver>(renderer, screen, resource, Asset::get(), input, options, section);
gameOver->run();
resource->free();
}
@@ -1834,7 +1833,7 @@ void Director::runGame()
}
JA_StopMusic();
loadResources(section);
auto game = std::make_unique<Game>(renderer, screen, resource, asset, options, input, section, debug);
auto game = std::make_unique<Game>(renderer, screen, resource, Asset::get(), options, input, section, debug);
game->run();
resource->free();
}