From 09ed0105e99d2176737e7cc53aafcd6e64c776bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Tue, 22 Nov 2022 16:26:58 +0100 Subject: [PATCH] =?UTF-8?q?Cambiada=20la=20ubicaci=C3=B3n=20del=20fichero?= =?UTF-8?q?=20config.txt=20a=20la=20carpeta=20de=20sistema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- release/config.txt | 16 ---------------- source/director.cpp | 6 ++++-- source/game.cpp | 3 +++ 3 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 release/config.txt diff --git a/release/config.txt b/release/config.txt deleted file mode 100644 index ffba48e..0000000 --- a/release/config.txt +++ /dev/null @@ -1,16 +0,0 @@ -## VISUAL OPTIONS -videoMode=0 -windowSize=3 -filter=FILTER_NEAREST -vSync=true -integerScale=true -keepAspect=true -borderEnabled=true -borderSize=0.200000 -palette=0 - -## ONLINE OPTIONS -enabled=false -server=jaildoctor.duckdns.org -port=9911 -jailerID= diff --git a/source/director.cpp b/source/director.cpp index c648173..27b2c1b 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -1225,9 +1225,11 @@ bool Director::setFileList() asset->add(prefix + "/data/font/debug.png", t_font); asset->add(prefix + "/data/font/debug.txt", t_font); - // Configuración + // Datos asset->add(prefix + "/data/input/gamecontrollerdb.txt", t_data); - asset->add(prefix + "/data/config/config.txt", t_data, false); + + // 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); diff --git a/source/game.cpp b/source/game.cpp index de1be51..f02f4dc 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -45,7 +45,10 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *as // Inicializa el resto de variables ticks = 0; ticksSpeed = 15; + board.lives = 9; +#ifdef DEBUG board.lives = 0; +#endif board.items = 0; board.rooms = 1; board.music = true;