From fbe31fb7d64ff218f3522a51d75f8c52efdeaa8a Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Tue, 18 Oct 2022 09:44:22 +0200 Subject: [PATCH] Corregidas las rutas a los ficheros de recursos --- data/actors/enemies/bug.ani | 4 +- data/actors/enemies/flying_eye.ani | 4 +- data/actors/enemies/flying_eye_horn.ani | 4 +- data/actors/enemies/manzana.ani | 4 +- data/actors/enemies/walking_eye.ani | 4 +- data/actors/items/diamond.ani | 4 +- data/actors/moving_platform.ani | 4 +- data/config/config.txt | 2 +- data/intro/intro.ani | 4 +- data/player/player.ani | 4 +- source/director.cpp | 130 ++++++++++++------------ 11 files changed, 84 insertions(+), 84 deletions(-) diff --git a/data/actors/enemies/bug.ani b/data/actors/enemies/bug.ani index 3580193..39710e0 100644 --- a/data/actors/enemies/bug.ani +++ b/data/actors/enemies/bug.ani @@ -1,5 +1,5 @@ -frame_width=16 -frame_height=16 +frameWidth=16 +frameHeight=16 [animation] name=default diff --git a/data/actors/enemies/flying_eye.ani b/data/actors/enemies/flying_eye.ani index 3580193..39710e0 100644 --- a/data/actors/enemies/flying_eye.ani +++ b/data/actors/enemies/flying_eye.ani @@ -1,5 +1,5 @@ -frame_width=16 -frame_height=16 +frameWidth=16 +frameHeight=16 [animation] name=default diff --git a/data/actors/enemies/flying_eye_horn.ani b/data/actors/enemies/flying_eye_horn.ani index 3943028..ab38cf6 100644 --- a/data/actors/enemies/flying_eye_horn.ani +++ b/data/actors/enemies/flying_eye_horn.ani @@ -1,5 +1,5 @@ -frame_width=16 -frame_height=16 +frameWidth=16 +frameHeight=16 [animation] name=default diff --git a/data/actors/enemies/manzana.ani b/data/actors/enemies/manzana.ani index 8b38f0c..c9906ee 100644 --- a/data/actors/enemies/manzana.ani +++ b/data/actors/enemies/manzana.ani @@ -1,5 +1,5 @@ -frame_width=16 -frame_height=16 +frameWidth=16 +frameHeight=16 [animation] name=default diff --git a/data/actors/enemies/walking_eye.ani b/data/actors/enemies/walking_eye.ani index 3580193..39710e0 100644 --- a/data/actors/enemies/walking_eye.ani +++ b/data/actors/enemies/walking_eye.ani @@ -1,5 +1,5 @@ -frame_width=16 -frame_height=16 +frameWidth=16 +frameHeight=16 [animation] name=default diff --git a/data/actors/items/diamond.ani b/data/actors/items/diamond.ani index 2e937a7..5458bde 100644 --- a/data/actors/items/diamond.ani +++ b/data/actors/items/diamond.ani @@ -1,5 +1,5 @@ -frame_width=16 -frame_height=16 +frameWidth=16 +frameHeight=16 [animation] name=default diff --git a/data/actors/moving_platform.ani b/data/actors/moving_platform.ani index f10bab6..218cdb5 100644 --- a/data/actors/moving_platform.ani +++ b/data/actors/moving_platform.ani @@ -1,5 +1,5 @@ -frame_width=16 -frame_height=8 +frameWidth=16 +frameHeight=8 [animation] name=default diff --git a/data/config/config.txt b/data/config/config.txt index fc81bab..56c3ec4 100644 --- a/data/config/config.txt +++ b/data/config/config.txt @@ -1,5 +1,5 @@ fullScreenMode=0 -windowSize=4 +windowSize=3 filter=FILTER_NEAREST vSync=true integerScale=true diff --git a/data/intro/intro.ani b/data/intro/intro.ani index a2fdcf7..bf39413 100644 --- a/data/intro/intro.ani +++ b/data/intro/intro.ani @@ -1,5 +1,5 @@ -frame_width=320 -frame_height=240 +frameWidth=320 +frameHeight=240 [animation] name=intro diff --git a/data/player/player.ani b/data/player/player.ani index f38e6b6..f819347 100644 --- a/data/player/player.ani +++ b/data/player/player.ani @@ -1,5 +1,5 @@ -frame_width=16 -frame_height=24 +frameWidth=16 +frameHeight=24 [animation] name=stand diff --git a/source/director.cpp b/source/director.cpp index dc7930b..c39311a 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -350,91 +350,91 @@ void Director::initInput() bool Director::setFileList() { // Ficheros del mapa - asset->add("/data/map/01.map", t_data); - asset->add("/data/map/01.tmx", t_data); - asset->add("/data/map/01.ene", t_data); - asset->add("/data/map/02.map", t_data); - asset->add("/data/map/02.tmx", t_data); - asset->add("/data/map/02.ene", t_data); - asset->add("/data/map/03.map", t_data); - asset->add("/data/map/03.tmx", t_data); - asset->add("/data/map/03.ene", t_data); - asset->add("/data/map/04.map", t_data); - asset->add("/data/map/04.tmx", t_data); - asset->add("/data/map/05.map", t_data); - asset->add("/data/map/05.tmx", t_data); - asset->add("/data/map/06.map", t_data); - asset->add("/data/map/06.tmx", t_data); - asset->add("/data/map/07.map", t_data); - asset->add("/data/map/07.tmx", t_data); - asset->add("/data/map/08.map", t_data); - asset->add("/data/map/08.tmx", t_data); - asset->add("/data/map/09.map", t_data); - asset->add("/data/map/09.tmx", t_data); - asset->add("/data/map/10.map", t_data); - asset->add("/data/map/10.tmx", t_data); - asset->add("/data/map/tiles_surface.png", t_bitmap); + asset->add("/../data/map/01.map", t_data); + asset->add("/../data/map/01.tmx", t_data); + asset->add("/../data/map/01.ene", t_data); + asset->add("/../data/map/02.map", t_data); + asset->add("/../data/map/02.tmx", t_data); + asset->add("/../data/map/02.ene", t_data); + asset->add("/../data/map/03.map", t_data); + asset->add("/../data/map/03.tmx", t_data); + asset->add("/../data/map/03.ene", t_data); + asset->add("/../data/map/04.map", t_data); + asset->add("/../data/map/04.tmx", t_data); + asset->add("/../data/map/05.map", t_data); + asset->add("/../data/map/05.tmx", t_data); + asset->add("/../data/map/06.map", t_data); + asset->add("/../data/map/06.tmx", t_data); + asset->add("/../data/map/07.map", t_data); + asset->add("/../data/map/07.tmx", t_data); + asset->add("/../data/map/08.map", t_data); + asset->add("/../data/map/08.tmx", t_data); + asset->add("/../data/map/09.map", t_data); + asset->add("/../data/map/09.tmx", t_data); + asset->add("/../data/map/10.map", t_data); + asset->add("/../data/map/10.tmx", t_data); + asset->add("/../data/map/tiles_surface.png", t_bitmap); // Ficheros de configuración - asset->add("/data/config/config.txt", t_data, false); - asset->add("/data/input/gamecontrollerdb.txt", t_data); + asset->add("/../data/config/config.txt", t_data, false); + asset->add("/../data/input/gamecontrollerdb.txt", t_data); // Ficheros del jugador - asset->add("/data/player/player.png", t_bitmap); - asset->add("/data/player/player.ani", t_data); + asset->add("/../data/player/player.png", t_bitmap); + asset->add("/../data/player/player.ani", t_data); // Ficheros de sonido - asset->add("/data/sound/sound_player_coin.wav", t_sound); - asset->add("/data/sound/sound_player_death.wav", t_sound); - asset->add("/data/sound/sound_drop_enemy.wav", t_sound); - asset->add("/data/sound/sound_drop_splat.wav", t_sound); - asset->add("/data/sound/sound_player_jump.wav", t_sound); - asset->add("/data/sound/sound_menu_logo.wav", t_sound); - asset->add("/data/sound/sound_menu_start.wav", t_sound); - asset->add("/data/sound/sound_menu_select.wav", t_sound); - asset->add("/data/sound/sound_menu_cancel.wav", t_sound); - asset->add("/data/sound/sound_menu_move.wav", t_sound); + asset->add("/../data/sound/sound_player_coin.wav", t_sound); + asset->add("/../data/sound/sound_player_death.wav", t_sound); + asset->add("/../data/sound/sound_drop_enemy.wav", t_sound); + asset->add("/../data/sound/sound_drop_splat.wav", t_sound); + asset->add("/../data/sound/sound_player_jump.wav", t_sound); + asset->add("/../data/sound/sound_menu_logo.wav", t_sound); + asset->add("/../data/sound/sound_menu_start.wav", t_sound); + asset->add("/../data/sound/sound_menu_select.wav", t_sound); + asset->add("/../data/sound/sound_menu_cancel.wav", t_sound); + asset->add("/../data/sound/sound_menu_move.wav", t_sound); // Ficheros con musica - asset->add("/data/music/music_title.ogg", t_music); - asset->add("/data/music/music_surface.ogg", t_music); - asset->add("/data/music/music_volcano.ogg", t_music); + asset->add("/../data/music/music_title.ogg", t_music); + asset->add("/../data/music/music_surface.ogg", t_music); + asset->add("/../data/music/music_volcano.ogg", t_music); // Ficheros de fuentes de texto - asset->add("/data/font/debug.png", t_font); - asset->add("/data/font/debug.txt", t_font); - asset->add("/data/font/dogica.png", t_font); - asset->add("/data/font/dogica.txt", t_font); - 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("/../data/font/dogica.png", t_font); + asset->add("/../data/font/dogica.txt", t_font); + asset->add("/../data/font/smb2.png", t_font); + asset->add("/../data/font/smb2.txt", t_font); // Ficheros de enemigos - asset->add("/data/actors/enemies/walking_eye.png", t_bitmap); - asset->add("/data/actors/enemies/walking_eye.ani", t_data); - asset->add("/data/actors/enemies/bug.png", t_bitmap); - asset->add("/data/actors/enemies/bug.ani", t_data); - asset->add("/data/actors/enemies/flying_eye.png", t_bitmap); - asset->add("/data/actors/enemies/flying_eye.ani", t_data); - asset->add("/data/actors/enemies/flying_eye_horn.png", t_bitmap); - asset->add("/data/actors/enemies/flying_eye_horn.ani", t_data); - asset->add("/data/actors/enemies/manzana.png", t_bitmap); - asset->add("/data/actors/enemies/manzana.ani", t_data); + asset->add("/../data/actors/enemies/walking_eye.png", t_bitmap); + asset->add("/../data/actors/enemies/walking_eye.ani", t_data); + asset->add("/../data/actors/enemies/bug.png", t_bitmap); + asset->add("/../data/actors/enemies/bug.ani", t_data); + asset->add("/../data/actors/enemies/flying_eye.png", t_bitmap); + asset->add("/../data/actors/enemies/flying_eye.ani", t_data); + asset->add("/../data/actors/enemies/flying_eye_horn.png", t_bitmap); + asset->add("/../data/actors/enemies/flying_eye_horn.ani", t_data); + asset->add("/../data/actors/enemies/manzana.png", t_bitmap); + asset->add("/../data/actors/enemies/manzana.ani", t_data); // Ficheros de actores - asset->add("/data/actors/moving_platform.png", t_bitmap); - asset->add("/data/actors/moving_platform.ani", t_data); - asset->add("/data/actors/items/diamond.png", t_bitmap); - asset->add("/data/actors/items/diamond.ani", t_data); + asset->add("/../data/actors/moving_platform.png", t_bitmap); + asset->add("/../data/actors/moving_platform.ani", t_data); + asset->add("/../data/actors/items/diamond.png", t_bitmap); + asset->add("/../data/actors/items/diamond.ani", t_data); // Ficheros del logo - asset->add("/data/logo/logo.png", t_bitmap); + asset->add("/../data/logo/logo.png", t_bitmap); // Ficheros de la intro - asset->add("/data/intro/intro.png", t_bitmap); - asset->add("/data/intro/intro.ani", t_data); + asset->add("/../data/intro/intro.png", t_bitmap); + asset->add("/../data/intro/intro.ani", t_data); // Ficheros de menu - asset->add("/data/menu/title.men", t_data); + asset->add("/../data/menu/title.men", t_data); return asset->check(); }