diff --git a/.gitignore b/.gitignore index 3337437..e8bf047 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,7 @@ scripts *.opk *.DS_Store jaildoctor* -*plist* \ No newline at end of file +*plist* +MacOS/* +Resources/* +Frameworks/* \ No newline at end of file diff --git a/Makefile b/Makefile index 1615bc7..f037028 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ executable = jaildoctors_dilemma source = source/*.cpp source/common/*.cpp +macosBundle = ../jaildoctors_dilemma_release/jaildoctors_dilemma.app/Contents/ windows: @echo off @@ -7,8 +8,16 @@ windows: g++ $(source) -std=c++11 -Wall -O2 -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o $(executable).exe strip -s -R .comment -R .gnu.version $(executable).exe --strip-unneeded macos: + rm -rdf data/config mkdir -p data/config g++ $(source) -std=c++11 -Wall -O2 -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_macos +macos_f: + rm -rdf data/config + mkdir -p data/config + cp data $(macosBundle)Resources + cp $(macosBundle)/Frameworks . + clang++ $(source) -std=c++11 -Wall -O2 -framework SDL2 -F ./Frameworks -ffunction-sections -fdata-sections -o $(macosBundle)MacOS/$(executable) -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12 + rm -rdf ./Frameworks linux: mkdir -p data/config g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(executable)_linux diff --git a/source/director.cpp b/source/director.cpp index f52dba1..49d6d2b 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -967,311 +967,311 @@ bool Director::initSDL() bool Director::setFileList() { // Texto - asset->add("/data/font/smb2.png", t_font); - asset->add("/data/font/smb2.txt", t_font); - asset->add("/data/font/debug.png", t_font); - asset->add("/data/font/debug.txt", t_font); + asset->add("/../Resources/data/font/smb2.png", t_font); + asset->add("/../Resources/data/font/smb2.txt", t_font); + asset->add("/../Resources/data/font/debug.png", t_font); + asset->add("/../Resources/data/font/debug.txt", t_font); // Configuración - asset->add("/data/input/gamecontrollerdb.txt", t_data); - asset->add("/data/config/config.txt", t_data, false); + asset->add("/../Resources/data/input/gamecontrollerdb.txt", t_data); + asset->add("/../Resources/data/config/config.txt", t_data, false); // Habitaciones - asset->add("/data/room/01.room", t_room); - asset->add("/data/room/02.room", t_room); - asset->add("/data/room/03.room", t_room); - asset->add("/data/room/04.room", t_room); - asset->add("/data/room/05.room", t_room); - asset->add("/data/room/06.room", t_room); - asset->add("/data/room/07.room", t_room); - asset->add("/data/room/08.room", t_room); - asset->add("/data/room/09.room", t_room); - asset->add("/data/room/10.room", t_room); - asset->add("/data/room/11.room", t_room); - asset->add("/data/room/12.room", t_room); - asset->add("/data/room/13.room", t_room); - asset->add("/data/room/14.room", t_room); - asset->add("/data/room/15.room", t_room); - asset->add("/data/room/16.room", t_room); - asset->add("/data/room/17.room", t_room); - asset->add("/data/room/18.room", t_room); - asset->add("/data/room/19.room", t_room); - asset->add("/data/room/20.room", t_room); - asset->add("/data/room/21.room", t_room); - asset->add("/data/room/22.room", t_room); - asset->add("/data/room/23.room", t_room); - asset->add("/data/room/24.room", t_room); - asset->add("/data/room/25.room", t_room); - asset->add("/data/room/26.room", t_room); - asset->add("/data/room/27.room", t_room); - asset->add("/data/room/28.room", t_room); - asset->add("/data/room/29.room", t_room); - asset->add("/data/room/30.room", t_room); - asset->add("/data/room/31.room", t_room); - asset->add("/data/room/32.room", t_room); - asset->add("/data/room/33.room", t_room); - asset->add("/data/room/34.room", t_room); - asset->add("/data/room/35.room", t_room); - asset->add("/data/room/36.room", t_room); - asset->add("/data/room/37.room", t_room); - asset->add("/data/room/38.room", t_room); - asset->add("/data/room/39.room", t_room); - asset->add("/data/room/40.room", t_room); - asset->add("/data/room/41.room", t_room); - asset->add("/data/room/42.room", t_room); - asset->add("/data/room/43.room", t_room); - asset->add("/data/room/44.room", t_room); - asset->add("/data/room/45.room", t_room); - asset->add("/data/room/46.room", t_room); - asset->add("/data/room/47.room", t_room); - asset->add("/data/room/48.room", t_room); - asset->add("/data/room/49.room", t_room); - asset->add("/data/room/50.room", t_room); - asset->add("/data/room/51.room", t_room); - asset->add("/data/room/52.room", t_room); - asset->add("/data/room/53.room", t_room); - asset->add("/data/room/54.room", t_room); - asset->add("/data/room/55.room", t_room); - asset->add("/data/room/56.room", t_room); - asset->add("/data/room/57.room", t_room); - asset->add("/data/room/58.room", t_room); - asset->add("/data/room/59.room", t_room); - asset->add("/data/room/60.room", t_room); + asset->add("/../Resources/data/room/01.room", t_room); + asset->add("/../Resources/data/room/02.room", t_room); + asset->add("/../Resources/data/room/03.room", t_room); + asset->add("/../Resources/data/room/04.room", t_room); + asset->add("/../Resources/data/room/05.room", t_room); + asset->add("/../Resources/data/room/06.room", t_room); + asset->add("/../Resources/data/room/07.room", t_room); + asset->add("/../Resources/data/room/08.room", t_room); + asset->add("/../Resources/data/room/09.room", t_room); + asset->add("/../Resources/data/room/10.room", t_room); + asset->add("/../Resources/data/room/11.room", t_room); + asset->add("/../Resources/data/room/12.room", t_room); + asset->add("/../Resources/data/room/13.room", t_room); + asset->add("/../Resources/data/room/14.room", t_room); + asset->add("/../Resources/data/room/15.room", t_room); + asset->add("/../Resources/data/room/16.room", t_room); + asset->add("/../Resources/data/room/17.room", t_room); + asset->add("/../Resources/data/room/18.room", t_room); + asset->add("/../Resources/data/room/19.room", t_room); + asset->add("/../Resources/data/room/20.room", t_room); + asset->add("/../Resources/data/room/21.room", t_room); + asset->add("/../Resources/data/room/22.room", t_room); + asset->add("/../Resources/data/room/23.room", t_room); + asset->add("/../Resources/data/room/24.room", t_room); + asset->add("/../Resources/data/room/25.room", t_room); + asset->add("/../Resources/data/room/26.room", t_room); + asset->add("/../Resources/data/room/27.room", t_room); + asset->add("/../Resources/data/room/28.room", t_room); + asset->add("/../Resources/data/room/29.room", t_room); + asset->add("/../Resources/data/room/30.room", t_room); + asset->add("/../Resources/data/room/31.room", t_room); + asset->add("/../Resources/data/room/32.room", t_room); + asset->add("/../Resources/data/room/33.room", t_room); + asset->add("/../Resources/data/room/34.room", t_room); + asset->add("/../Resources/data/room/35.room", t_room); + asset->add("/../Resources/data/room/36.room", t_room); + asset->add("/../Resources/data/room/37.room", t_room); + asset->add("/../Resources/data/room/38.room", t_room); + asset->add("/../Resources/data/room/39.room", t_room); + asset->add("/../Resources/data/room/40.room", t_room); + asset->add("/../Resources/data/room/41.room", t_room); + asset->add("/../Resources/data/room/42.room", t_room); + asset->add("/../Resources/data/room/43.room", t_room); + asset->add("/../Resources/data/room/44.room", t_room); + asset->add("/../Resources/data/room/45.room", t_room); + asset->add("/../Resources/data/room/46.room", t_room); + asset->add("/../Resources/data/room/47.room", t_room); + asset->add("/../Resources/data/room/48.room", t_room); + asset->add("/../Resources/data/room/49.room", t_room); + asset->add("/../Resources/data/room/50.room", t_room); + asset->add("/../Resources/data/room/51.room", t_room); + asset->add("/../Resources/data/room/52.room", t_room); + asset->add("/../Resources/data/room/53.room", t_room); + asset->add("/../Resources/data/room/54.room", t_room); + asset->add("/../Resources/data/room/55.room", t_room); + asset->add("/../Resources/data/room/56.room", t_room); + asset->add("/../Resources/data/room/57.room", t_room); + asset->add("/../Resources/data/room/58.room", t_room); + asset->add("/../Resources/data/room/59.room", t_room); + asset->add("/../Resources/data/room/60.room", t_room); // Tilemaps - asset->add("/data/room/01.tmx", t_room); - asset->add("/data/room/02.tmx", t_room); - asset->add("/data/room/03.tmx", t_room); - asset->add("/data/room/04.tmx", t_room); - asset->add("/data/room/05.tmx", t_room); - asset->add("/data/room/06.tmx", t_room); - asset->add("/data/room/07.tmx", t_room); - asset->add("/data/room/08.tmx", t_room); - asset->add("/data/room/09.tmx", t_room); - asset->add("/data/room/10.tmx", t_room); - asset->add("/data/room/11.tmx", t_room); - asset->add("/data/room/12.tmx", t_room); - asset->add("/data/room/13.tmx", t_room); - asset->add("/data/room/14.tmx", t_room); - asset->add("/data/room/15.tmx", t_room); - asset->add("/data/room/16.tmx", t_room); - asset->add("/data/room/17.tmx", t_room); - asset->add("/data/room/18.tmx", t_room); - asset->add("/data/room/19.tmx", t_room); - asset->add("/data/room/20.tmx", t_room); - asset->add("/data/room/21.tmx", t_room); - asset->add("/data/room/22.tmx", t_room); - asset->add("/data/room/23.tmx", t_room); - asset->add("/data/room/24.tmx", t_room); - asset->add("/data/room/25.tmx", t_room); - asset->add("/data/room/26.tmx", t_room); - asset->add("/data/room/27.tmx", t_room); - asset->add("/data/room/28.tmx", t_room); - asset->add("/data/room/29.tmx", t_room); - asset->add("/data/room/30.tmx", t_room); - asset->add("/data/room/31.tmx", t_room); - asset->add("/data/room/32.tmx", t_room); - asset->add("/data/room/33.tmx", t_room); - asset->add("/data/room/34.tmx", t_room); - asset->add("/data/room/35.tmx", t_room); - asset->add("/data/room/36.tmx", t_room); - asset->add("/data/room/37.tmx", t_room); - asset->add("/data/room/38.tmx", t_room); - asset->add("/data/room/39.tmx", t_room); - asset->add("/data/room/40.tmx", t_room); - asset->add("/data/room/41.tmx", t_room); - asset->add("/data/room/42.tmx", t_room); - asset->add("/data/room/43.tmx", t_room); - asset->add("/data/room/44.tmx", t_room); - asset->add("/data/room/45.tmx", t_room); - asset->add("/data/room/46.tmx", t_room); - asset->add("/data/room/47.tmx", t_room); - asset->add("/data/room/48.tmx", t_room); - asset->add("/data/room/49.tmx", t_room); - asset->add("/data/room/50.tmx", t_room); - asset->add("/data/room/51.tmx", t_room); - asset->add("/data/room/52.tmx", t_room); - asset->add("/data/room/53.tmx", t_room); - asset->add("/data/room/54.tmx", t_room); - asset->add("/data/room/55.tmx", t_room); - asset->add("/data/room/56.tmx", t_room); - asset->add("/data/room/57.tmx", t_room); - asset->add("/data/room/58.tmx", t_room); - asset->add("/data/room/59.tmx", t_room); - asset->add("/data/room/60.tmx", t_room); + asset->add("/../Resources/data/room/01.tmx", t_room); + asset->add("/../Resources/data/room/02.tmx", t_room); + asset->add("/../Resources/data/room/03.tmx", t_room); + asset->add("/../Resources/data/room/04.tmx", t_room); + asset->add("/../Resources/data/room/05.tmx", t_room); + asset->add("/../Resources/data/room/06.tmx", t_room); + asset->add("/../Resources/data/room/07.tmx", t_room); + asset->add("/../Resources/data/room/08.tmx", t_room); + asset->add("/../Resources/data/room/09.tmx", t_room); + asset->add("/../Resources/data/room/10.tmx", t_room); + asset->add("/../Resources/data/room/11.tmx", t_room); + asset->add("/../Resources/data/room/12.tmx", t_room); + asset->add("/../Resources/data/room/13.tmx", t_room); + asset->add("/../Resources/data/room/14.tmx", t_room); + asset->add("/../Resources/data/room/15.tmx", t_room); + asset->add("/../Resources/data/room/16.tmx", t_room); + asset->add("/../Resources/data/room/17.tmx", t_room); + asset->add("/../Resources/data/room/18.tmx", t_room); + asset->add("/../Resources/data/room/19.tmx", t_room); + asset->add("/../Resources/data/room/20.tmx", t_room); + asset->add("/../Resources/data/room/21.tmx", t_room); + asset->add("/../Resources/data/room/22.tmx", t_room); + asset->add("/../Resources/data/room/23.tmx", t_room); + asset->add("/../Resources/data/room/24.tmx", t_room); + asset->add("/../Resources/data/room/25.tmx", t_room); + asset->add("/../Resources/data/room/26.tmx", t_room); + asset->add("/../Resources/data/room/27.tmx", t_room); + asset->add("/../Resources/data/room/28.tmx", t_room); + asset->add("/../Resources/data/room/29.tmx", t_room); + asset->add("/../Resources/data/room/30.tmx", t_room); + asset->add("/../Resources/data/room/31.tmx", t_room); + asset->add("/../Resources/data/room/32.tmx", t_room); + asset->add("/../Resources/data/room/33.tmx", t_room); + asset->add("/../Resources/data/room/34.tmx", t_room); + asset->add("/../Resources/data/room/35.tmx", t_room); + asset->add("/../Resources/data/room/36.tmx", t_room); + asset->add("/../Resources/data/room/37.tmx", t_room); + asset->add("/../Resources/data/room/38.tmx", t_room); + asset->add("/../Resources/data/room/39.tmx", t_room); + asset->add("/../Resources/data/room/40.tmx", t_room); + asset->add("/../Resources/data/room/41.tmx", t_room); + asset->add("/../Resources/data/room/42.tmx", t_room); + asset->add("/../Resources/data/room/43.tmx", t_room); + asset->add("/../Resources/data/room/44.tmx", t_room); + asset->add("/../Resources/data/room/45.tmx", t_room); + asset->add("/../Resources/data/room/46.tmx", t_room); + asset->add("/../Resources/data/room/47.tmx", t_room); + asset->add("/../Resources/data/room/48.tmx", t_room); + asset->add("/../Resources/data/room/49.tmx", t_room); + asset->add("/../Resources/data/room/50.tmx", t_room); + asset->add("/../Resources/data/room/51.tmx", t_room); + asset->add("/../Resources/data/room/52.tmx", t_room); + asset->add("/../Resources/data/room/53.tmx", t_room); + asset->add("/../Resources/data/room/54.tmx", t_room); + asset->add("/../Resources/data/room/55.tmx", t_room); + asset->add("/../Resources/data/room/56.tmx", t_room); + asset->add("/../Resources/data/room/57.tmx", t_room); + asset->add("/../Resources/data/room/58.tmx", t_room); + asset->add("/../Resources/data/room/59.tmx", t_room); + asset->add("/../Resources/data/room/60.tmx", t_room); // Tilesets - asset->add("/data/tilesets/standard.png", t_bitmap); - asset->add("/data/tilesets/standard_zxarne.png", t_bitmap); + asset->add("/../Resources/data/tilesets/standard.png", t_bitmap); + asset->add("/../Resources/data/tilesets/standard_zxarne.png", t_bitmap); // Enemigos - asset->add("/data/enemies/abad_bell.ani", t_data); - asset->add("/data/enemies/abad_bell.png", t_bitmap); - asset->add("/data/enemies/abad.ani", t_data); - asset->add("/data/enemies/abad.png", t_bitmap); - asset->add("/data/enemies/amstrad_cs.ani", t_data); - asset->add("/data/enemies/amstrad_cs.png", t_bitmap); - asset->add("/data/enemies/arounder_fly.ani", t_data); - asset->add("/data/enemies/arounder_fly.png", t_bitmap); - asset->add("/data/enemies/arounder_stop.ani", t_data); - asset->add("/data/enemies/arounder_stop.png", t_bitmap); - asset->add("/data/enemies/arounder_walk.ani", t_data); - asset->add("/data/enemies/arounder_walk.png", t_bitmap); - asset->add("/data/enemies/arounders_door.ani", t_data); - asset->add("/data/enemies/arounders_door.png", t_bitmap); - asset->add("/data/enemies/arounders_machine.ani", t_data); - asset->add("/data/enemies/arounders_machine.png", t_bitmap); - asset->add("/data/enemies/bat.ani", t_data); - asset->add("/data/enemies/bat.png", t_bitmap); - asset->add("/data/enemies/batman_bell.ani", t_data); - asset->add("/data/enemies/batman_bell.png", t_bitmap); - asset->add("/data/enemies/batman_fire.ani", t_data); - asset->add("/data/enemies/batman_fire.png", t_bitmap); - asset->add("/data/enemies/batman.ani", t_data); - asset->add("/data/enemies/batman.png", t_bitmap); - asset->add("/data/enemies/bell.ani", t_data); - asset->add("/data/enemies/bell.png", t_bitmap); - asset->add("/data/enemies/bin.ani", t_data); - asset->add("/data/enemies/bin.png", t_bitmap); - asset->add("/data/enemies/bird.ani", t_data); - asset->add("/data/enemies/bird.png", t_bitmap); - asset->add("/data/enemies/breakout.ani", t_data); - asset->add("/data/enemies/breakout.png", t_bitmap); - asset->add("/data/enemies/bry.ani", t_data); - asset->add("/data/enemies/bry.png", t_bitmap); - asset->add("/data/enemies/chip.ani", t_data); - asset->add("/data/enemies/chip.png", t_bitmap); - asset->add("/data/enemies/code.ani", t_data); - asset->add("/data/enemies/code.png", t_bitmap); - asset->add("/data/enemies/congo.ani", t_data); - asset->add("/data/enemies/congo.png", t_bitmap); - asset->add("/data/enemies/demon.ani", t_data); - asset->add("/data/enemies/demon.png", t_bitmap); - asset->add("/data/enemies/heavy.ani", t_data); - asset->add("/data/enemies/heavy.png", t_bitmap); - asset->add("/data/enemies/dimallas.ani", t_data); - asset->add("/data/enemies/dimallas.png", t_bitmap); - asset->add("/data/enemies/diskette.ani", t_data); - asset->add("/data/enemies/diskette.png", t_bitmap); - asset->add("/data/enemies/dong.ani", t_data); - asset->add("/data/enemies/dong.png", t_bitmap); - asset->add("/data/enemies/guitar.ani", t_data); - asset->add("/data/enemies/guitar.png", t_bitmap); - asset->add("/data/enemies/jb_alien.ani", t_data); - asset->add("/data/enemies/jb_alien.png", t_bitmap); - asset->add("/data/enemies/jb_human.ani", t_data); - asset->add("/data/enemies/jb_human.png", t_bitmap); - asset->add("/data/enemies/jailer.ani", t_data); - asset->add("/data/enemies/jailer.png", t_bitmap); - asset->add("/data/enemies/jailer2.ani", t_data); - asset->add("/data/enemies/jailer2.png", t_bitmap); - asset->add("/data/enemies/jailer3.ani", t_data); - asset->add("/data/enemies/jailer3.png", t_bitmap); - asset->add("/data/enemies/lamp.ani", t_data); - asset->add("/data/enemies/lamp.png", t_bitmap); - asset->add("/data/enemies/macaronni_ted.ani", t_data); - asset->add("/data/enemies/macaronni_ted.png", t_bitmap); - asset->add("/data/enemies/matatunos.ani", t_data); - asset->add("/data/enemies/matatunos.png", t_bitmap); - asset->add("/data/enemies/mummy.ani", t_data); - asset->add("/data/enemies/mummy.png", t_bitmap); - asset->add("/data/enemies/paco.ani", t_data); - asset->add("/data/enemies/paco.png", t_bitmap); - asset->add("/data/enemies/printer.ani", t_data); - asset->add("/data/enemies/printer.png", t_bitmap); - asset->add("/data/enemies/qvoid.ani", t_data); - asset->add("/data/enemies/qvoid.png", t_bitmap); - asset->add("/data/enemies/sam.ani", t_data); - asset->add("/data/enemies/sam.png", t_bitmap); - asset->add("/data/enemies/sigmasua.ani", t_data); - asset->add("/data/enemies/sigmasua.png", t_bitmap); - asset->add("/data/enemies/spider.ani", t_data); - asset->add("/data/enemies/spider.png", t_bitmap); - asset->add("/data/enemies/tuno.ani", t_data); - asset->add("/data/enemies/tuno.png", t_bitmap); - asset->add("/data/enemies/tv_panel.ani", t_data); - asset->add("/data/enemies/tv_panel.png", t_bitmap); - asset->add("/data/enemies/tv.ani", t_data); - asset->add("/data/enemies/tv.png", t_bitmap); - asset->add("/data/enemies/shock.ani", t_data); - asset->add("/data/enemies/shock.png", t_bitmap); - asset->add("/data/enemies/wave.ani", t_data); - asset->add("/data/enemies/wave.png", t_bitmap); + asset->add("/../Resources/data/enemies/abad_bell.ani", t_data); + asset->add("/../Resources/data/enemies/abad_bell.png", t_bitmap); + asset->add("/../Resources/data/enemies/abad.ani", t_data); + asset->add("/../Resources/data/enemies/abad.png", t_bitmap); + asset->add("/../Resources/data/enemies/amstrad_cs.ani", t_data); + asset->add("/../Resources/data/enemies/amstrad_cs.png", t_bitmap); + asset->add("/../Resources/data/enemies/arounder_fly.ani", t_data); + asset->add("/../Resources/data/enemies/arounder_fly.png", t_bitmap); + asset->add("/../Resources/data/enemies/arounder_stop.ani", t_data); + asset->add("/../Resources/data/enemies/arounder_stop.png", t_bitmap); + asset->add("/../Resources/data/enemies/arounder_walk.ani", t_data); + asset->add("/../Resources/data/enemies/arounder_walk.png", t_bitmap); + asset->add("/../Resources/data/enemies/arounders_door.ani", t_data); + asset->add("/../Resources/data/enemies/arounders_door.png", t_bitmap); + asset->add("/../Resources/data/enemies/arounders_machine.ani", t_data); + asset->add("/../Resources/data/enemies/arounders_machine.png", t_bitmap); + asset->add("/../Resources/data/enemies/bat.ani", t_data); + asset->add("/../Resources/data/enemies/bat.png", t_bitmap); + asset->add("/../Resources/data/enemies/batman_bell.ani", t_data); + asset->add("/../Resources/data/enemies/batman_bell.png", t_bitmap); + asset->add("/../Resources/data/enemies/batman_fire.ani", t_data); + asset->add("/../Resources/data/enemies/batman_fire.png", t_bitmap); + asset->add("/../Resources/data/enemies/batman.ani", t_data); + asset->add("/../Resources/data/enemies/batman.png", t_bitmap); + asset->add("/../Resources/data/enemies/bell.ani", t_data); + asset->add("/../Resources/data/enemies/bell.png", t_bitmap); + asset->add("/../Resources/data/enemies/bin.ani", t_data); + asset->add("/../Resources/data/enemies/bin.png", t_bitmap); + asset->add("/../Resources/data/enemies/bird.ani", t_data); + asset->add("/../Resources/data/enemies/bird.png", t_bitmap); + asset->add("/../Resources/data/enemies/breakout.ani", t_data); + asset->add("/../Resources/data/enemies/breakout.png", t_bitmap); + asset->add("/../Resources/data/enemies/bry.ani", t_data); + asset->add("/../Resources/data/enemies/bry.png", t_bitmap); + asset->add("/../Resources/data/enemies/chip.ani", t_data); + asset->add("/../Resources/data/enemies/chip.png", t_bitmap); + asset->add("/../Resources/data/enemies/code.ani", t_data); + asset->add("/../Resources/data/enemies/code.png", t_bitmap); + asset->add("/../Resources/data/enemies/congo.ani", t_data); + asset->add("/../Resources/data/enemies/congo.png", t_bitmap); + asset->add("/../Resources/data/enemies/demon.ani", t_data); + asset->add("/../Resources/data/enemies/demon.png", t_bitmap); + asset->add("/../Resources/data/enemies/heavy.ani", t_data); + asset->add("/../Resources/data/enemies/heavy.png", t_bitmap); + asset->add("/../Resources/data/enemies/dimallas.ani", t_data); + asset->add("/../Resources/data/enemies/dimallas.png", t_bitmap); + asset->add("/../Resources/data/enemies/diskette.ani", t_data); + asset->add("/../Resources/data/enemies/diskette.png", t_bitmap); + asset->add("/../Resources/data/enemies/dong.ani", t_data); + asset->add("/../Resources/data/enemies/dong.png", t_bitmap); + asset->add("/../Resources/data/enemies/guitar.ani", t_data); + asset->add("/../Resources/data/enemies/guitar.png", t_bitmap); + asset->add("/../Resources/data/enemies/jb_alien.ani", t_data); + asset->add("/../Resources/data/enemies/jb_alien.png", t_bitmap); + asset->add("/../Resources/data/enemies/jb_human.ani", t_data); + asset->add("/../Resources/data/enemies/jb_human.png", t_bitmap); + asset->add("/../Resources/data/enemies/jailer.ani", t_data); + asset->add("/../Resources/data/enemies/jailer.png", t_bitmap); + asset->add("/../Resources/data/enemies/jailer2.ani", t_data); + asset->add("/../Resources/data/enemies/jailer2.png", t_bitmap); + asset->add("/../Resources/data/enemies/jailer3.ani", t_data); + asset->add("/../Resources/data/enemies/jailer3.png", t_bitmap); + asset->add("/../Resources/data/enemies/lamp.ani", t_data); + asset->add("/../Resources/data/enemies/lamp.png", t_bitmap); + asset->add("/../Resources/data/enemies/macaronni_ted.ani", t_data); + asset->add("/../Resources/data/enemies/macaronni_ted.png", t_bitmap); + asset->add("/../Resources/data/enemies/matatunos.ani", t_data); + asset->add("/../Resources/data/enemies/matatunos.png", t_bitmap); + asset->add("/../Resources/data/enemies/mummy.ani", t_data); + asset->add("/../Resources/data/enemies/mummy.png", t_bitmap); + asset->add("/../Resources/data/enemies/paco.ani", t_data); + asset->add("/../Resources/data/enemies/paco.png", t_bitmap); + asset->add("/../Resources/data/enemies/printer.ani", t_data); + asset->add("/../Resources/data/enemies/printer.png", t_bitmap); + asset->add("/../Resources/data/enemies/qvoid.ani", t_data); + asset->add("/../Resources/data/enemies/qvoid.png", t_bitmap); + asset->add("/../Resources/data/enemies/sam.ani", t_data); + asset->add("/../Resources/data/enemies/sam.png", t_bitmap); + asset->add("/../Resources/data/enemies/sigmasua.ani", t_data); + asset->add("/../Resources/data/enemies/sigmasua.png", t_bitmap); + asset->add("/../Resources/data/enemies/spider.ani", t_data); + asset->add("/../Resources/data/enemies/spider.png", t_bitmap); + asset->add("/../Resources/data/enemies/tuno.ani", t_data); + asset->add("/../Resources/data/enemies/tuno.png", t_bitmap); + asset->add("/../Resources/data/enemies/tv_panel.ani", t_data); + asset->add("/../Resources/data/enemies/tv_panel.png", t_bitmap); + asset->add("/../Resources/data/enemies/tv.ani", t_data); + asset->add("/../Resources/data/enemies/tv.png", t_bitmap); + asset->add("/../Resources/data/enemies/shock.ani", t_data); + asset->add("/../Resources/data/enemies/shock.png", t_bitmap); + asset->add("/../Resources/data/enemies/wave.ani", t_data); + asset->add("/../Resources/data/enemies/wave.png", t_bitmap); // Jugador - asset->add("/data/player/player.png", t_bitmap); - asset->add("/data/player/player.ani", t_data); - asset->add("/data/player/player2.png", t_bitmap); - asset->add("/data/player/player2.ani", t_data); - asset->add("/data/player/player_game_over.png", t_bitmap); - asset->add("/data/player/player_game_over.ani", t_data); + asset->add("/../Resources/data/player/player.png", t_bitmap); + asset->add("/../Resources/data/player/player.ani", t_data); + asset->add("/../Resources/data/player/player2.png", t_bitmap); + asset->add("/../Resources/data/player/player2.ani", t_data); + asset->add("/../Resources/data/player/player_game_over.png", t_bitmap); + asset->add("/../Resources/data/player/player_game_over.ani", t_data); // Items - asset->add("/data/items/items.png", t_bitmap); + asset->add("/../Resources/data/items/items.png", t_bitmap); // Musicas - asset->add("/data/music/title.ogg", t_music); - asset->add("/data/music/game.ogg", t_music); - asset->add("/data/music/loading_sound1.ogg", t_music); - asset->add("/data/music/loading_sound2.ogg", t_music); - asset->add("/data/music/loading_sound3.ogg", t_music); - asset->add("/data/music/ending1.ogg", t_music); - asset->add("/data/music/ending2.ogg", t_music); - asset->add("/data/music/game_over.ogg", t_music); + asset->add("/../Resources/data/music/title.ogg", t_music); + asset->add("/../Resources/data/music/game.ogg", t_music); + asset->add("/../Resources/data/music/loading_sound1.ogg", t_music); + asset->add("/../Resources/data/music/loading_sound2.ogg", t_music); + asset->add("/../Resources/data/music/loading_sound3.ogg", t_music); + asset->add("/../Resources/data/music/ending1.ogg", t_music); + asset->add("/../Resources/data/music/ending2.ogg", t_music); + asset->add("/../Resources/data/music/game_over.ogg", t_music); // Efectos de sonido - asset->add("/data/sound/item.wav", t_sound); - asset->add("/data/sound/death.wav", t_sound); - asset->add("/data/sound/jump1.wav", t_sound); - asset->add("/data/sound/jump2.wav", t_sound); - asset->add("/data/sound/jump3.wav", t_sound); - asset->add("/data/sound/jump4.wav", t_sound); - asset->add("/data/sound/jump5.wav", t_sound); - asset->add("/data/sound/jump6.wav", t_sound); - asset->add("/data/sound/jump7.wav", t_sound); - asset->add("/data/sound/jump8.wav", t_sound); - asset->add("/data/sound/jump9.wav", t_sound); - asset->add("/data/sound/jump10.wav", t_sound); - asset->add("/data/sound/jump11.wav", t_sound); - asset->add("/data/sound/jump12.wav", t_sound); - asset->add("/data/sound/jump13.wav", t_sound); - asset->add("/data/sound/jump14.wav", t_sound); - asset->add("/data/sound/jump15.wav", t_sound); - asset->add("/data/sound/jump16.wav", t_sound); - asset->add("/data/sound/jump17.wav", t_sound); - asset->add("/data/sound/jump18.wav", t_sound); - asset->add("/data/sound/jump19.wav", t_sound); - asset->add("/data/sound/jump20.wav", t_sound); - asset->add("/data/sound/jump21.wav", t_sound); - asset->add("/data/sound/jump22.wav", t_sound); - asset->add("/data/sound/jump23.wav", t_sound); - asset->add("/data/sound/jump24.wav", t_sound); + asset->add("/../Resources/data/sound/item.wav", t_sound); + asset->add("/../Resources/data/sound/death.wav", t_sound); + asset->add("/../Resources/data/sound/jump1.wav", t_sound); + asset->add("/../Resources/data/sound/jump2.wav", t_sound); + asset->add("/../Resources/data/sound/jump3.wav", t_sound); + asset->add("/../Resources/data/sound/jump4.wav", t_sound); + asset->add("/../Resources/data/sound/jump5.wav", t_sound); + asset->add("/../Resources/data/sound/jump6.wav", t_sound); + asset->add("/../Resources/data/sound/jump7.wav", t_sound); + asset->add("/../Resources/data/sound/jump8.wav", t_sound); + asset->add("/../Resources/data/sound/jump9.wav", t_sound); + asset->add("/../Resources/data/sound/jump10.wav", t_sound); + asset->add("/../Resources/data/sound/jump11.wav", t_sound); + asset->add("/../Resources/data/sound/jump12.wav", t_sound); + asset->add("/../Resources/data/sound/jump13.wav", t_sound); + asset->add("/../Resources/data/sound/jump14.wav", t_sound); + asset->add("/../Resources/data/sound/jump15.wav", t_sound); + asset->add("/../Resources/data/sound/jump16.wav", t_sound); + asset->add("/../Resources/data/sound/jump17.wav", t_sound); + asset->add("/../Resources/data/sound/jump18.wav", t_sound); + asset->add("/../Resources/data/sound/jump19.wav", t_sound); + asset->add("/../Resources/data/sound/jump20.wav", t_sound); + asset->add("/../Resources/data/sound/jump21.wav", t_sound); + asset->add("/../Resources/data/sound/jump22.wav", t_sound); + asset->add("/../Resources/data/sound/jump23.wav", t_sound); + asset->add("/../Resources/data/sound/jump24.wav", t_sound); // Logo - asset->add("/data/logo/jailgames.png", t_bitmap); - asset->add("/data/logo/since_1998.png", t_bitmap); + asset->add("/../Resources/data/logo/jailgames.png", t_bitmap); + asset->add("/../Resources/data/logo/since_1998.png", t_bitmap); // Intro - asset->add("/data/title/loading_screen_bn.png", t_bitmap); - asset->add("/data/title/loading_screen_color.png", t_bitmap); - asset->add("/data/title/loading_screen_bn_zxarne.png", t_bitmap); - asset->add("/data/title/loading_screen_color_zxarne.png", t_bitmap); + asset->add("/../Resources/data/title/loading_screen_bn.png", t_bitmap); + asset->add("/../Resources/data/title/loading_screen_color.png", t_bitmap); + asset->add("/../Resources/data/title/loading_screen_bn_zxarne.png", t_bitmap); + asset->add("/../Resources/data/title/loading_screen_color_zxarne.png", t_bitmap); // Ending - asset->add("/data/ending/ending1.png", t_bitmap); - asset->add("/data/ending/ending1_zxarne.png", t_bitmap); - asset->add("/data/ending/ending2.png", t_bitmap); - asset->add("/data/ending/ending2_zxarne.png", t_bitmap); - asset->add("/data/ending/ending3.png", t_bitmap); - asset->add("/data/ending/ending3_zxarne.png", t_bitmap); - asset->add("/data/ending/ending4.png", t_bitmap); - asset->add("/data/ending/ending4_zxarne.png", t_bitmap); - asset->add("/data/ending/ending5.png", t_bitmap); - asset->add("/data/ending/ending5_zxarne.png", t_bitmap); + asset->add("/../Resources/data/ending/ending1.png", t_bitmap); + asset->add("/../Resources/data/ending/ending1_zxarne.png", t_bitmap); + asset->add("/../Resources/data/ending/ending2.png", t_bitmap); + asset->add("/../Resources/data/ending/ending2_zxarne.png", t_bitmap); + asset->add("/../Resources/data/ending/ending3.png", t_bitmap); + asset->add("/../Resources/data/ending/ending3_zxarne.png", t_bitmap); + asset->add("/../Resources/data/ending/ending4.png", t_bitmap); + asset->add("/../Resources/data/ending/ending4_zxarne.png", t_bitmap); + asset->add("/../Resources/data/ending/ending5.png", t_bitmap); + asset->add("/../Resources/data/ending/ending5_zxarne.png", t_bitmap); // Credits - asset->add("/data/credits/shine.png", t_bitmap); - asset->add("/data/credits/shine.ani", t_bitmap); + asset->add("/../Resources/data/credits/shine.png", t_bitmap); + asset->add("/../Resources/data/credits/shine.ani", t_bitmap); return asset->check(); }