diff --git a/data/config/param.txt b/data/config/param.txt index cbb5da5..40fed28 100644 --- a/data/config/param.txt +++ b/data/config/param.txt @@ -13,4 +13,7 @@ fadePostDuration 50 scoreboard.x 10 scoreboard.y 208 scoreboard.w 300 -scoreboard.h 32 \ No newline at end of file +scoreboard.h 32 + +#TITLE +pressStart 160 \ No newline at end of file diff --git a/data/gfx/title_bg_tile.png b/data/gfx/title_bg_tile.png index 6f0ea29..701763e 100644 Binary files a/data/gfx/title_bg_tile.png and b/data/gfx/title_bg_tile.png differ diff --git a/data/gfx/title_coffee.png b/data/gfx/title_coffee.png index 1dc74c0..1cc9860 100644 Binary files a/data/gfx/title_coffee.png and b/data/gfx/title_coffee.png differ diff --git a/data/gfx/title_crisis.png b/data/gfx/title_crisis.png index be75692..e983532 100644 Binary files a/data/gfx/title_crisis.png and b/data/gfx/title_crisis.png differ diff --git a/source/common/utils.h b/source/common/utils.h index a990e19..851aec1 100644 --- a/source/common/utils.h +++ b/source/common/utils.h @@ -168,6 +168,8 @@ struct param_t int fadeRandomSquaresDelay; // Duración entre cada pintado de cuadrados int fadeRandomSquaresMult; // Cantidad de cuadrados que se pintaran cada vez int fadePostDuration; // Duración final del fade + + int pressStart; // Posición del texto para empezar a jugar }; // Calcula el cuadrado de la distancia entre dos puntos diff --git a/source/game_logo.cpp b/source/game_logo.cpp index c68f16d..7ff79cc 100644 --- a/source/game_logo.cpp +++ b/source/game_logo.cpp @@ -65,30 +65,30 @@ void GameLogo::init() // Inicializa el bitmap de 'Coffee' coffeeBitmap->init(); coffeeBitmap->setPosX(xp); - coffeeBitmap->setPosY(y - coffeeBitmap->getHeight() - desp); - coffeeBitmap->setWidth(167); - coffeeBitmap->setHeight(46); + coffeeBitmap->setPosY(y - coffeeTexture->getHeight() - desp); + coffeeBitmap->setWidth(coffeeTexture->getWidth()); + coffeeBitmap->setHeight(coffeeTexture->getHeight()); coffeeBitmap->setVelX(0.0f); coffeeBitmap->setVelY(2.5f); coffeeBitmap->setAccelX(0.0f); coffeeBitmap->setAccelY(0.1f); - coffeeBitmap->setSpriteClip(0, 0, 167, 46); + coffeeBitmap->setSpriteClip(0, 0, coffeeTexture->getWidth(), coffeeTexture->getHeight()); coffeeBitmap->setEnabled(true); coffeeBitmap->setEnabledCounter(0); coffeeBitmap->setDestX(xp); - coffeeBitmap->setDestY(y - coffeeBitmap->getHeight()); + coffeeBitmap->setDestY(y - coffeeTexture->getHeight()); // Inicializa el bitmap de 'Crisis' crisisBitmap->init(); crisisBitmap->setPosX(xp + 15); crisisBitmap->setPosY(y + desp); - crisisBitmap->setWidth(137); - crisisBitmap->setHeight(46); + crisisBitmap->setWidth(crisisTexture->getWidth()); + crisisBitmap->setHeight(crisisTexture->getHeight()); crisisBitmap->setVelX(0.0f); crisisBitmap->setVelY(-2.5f); crisisBitmap->setAccelX(0.0f); crisisBitmap->setAccelY(-0.1f); - crisisBitmap->setSpriteClip(0, 0, 137, 46); + crisisBitmap->setSpriteClip(0, 0, crisisTexture->getWidth(), crisisTexture->getHeight()); crisisBitmap->setEnabled(true); crisisBitmap->setEnabledCounter(0); crisisBitmap->setDestX(xp + 15); diff --git a/source/load_param.cpp b/source/load_param.cpp index 073e5f4..b43456d 100644 --- a/source/load_param.cpp +++ b/source/load_param.cpp @@ -21,6 +21,9 @@ void initParam(param_t *param) param->fadeRandomSquaresDelay = 1; param->fadeRandomSquaresMult = 8; param->fadePostDuration = 20; + + // Posició del texto para empezar a jugar + param->pressStart = 180; } // Establece valores para los parametros a partir de un fichero de texto @@ -73,7 +76,7 @@ void loadParam(param_t *param, std::string filePath) { // Se queda con la primera palabra param1 = line.substr(0, pos); - + // Y recorta la linea line = line.substr(pos, std::string::npos); @@ -172,6 +175,11 @@ bool setOptions(param_t *param, std::string var, std::string value) param->scoreboard.h = std::stoi(value); } + else if (var == "pressStart") + { + param->pressStart = std::stoi(value); + } + else { success = false; diff --git a/source/title.cpp b/source/title.cpp index 09165da..f55ecb5 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -252,7 +252,7 @@ void Title::render() // 'PULSA 1P o 2P PARA JUGAR' if (counter % 50 > 14) { - text1->writeDX(TXT_CENTER | TXT_SHADOW, GAMECANVAS_CENTER_X, param->gameHeight / 5 * 3, lang->getText(23), 1, noColor, 1, shdwTxtColor); + text1->writeDX(TXT_CENTER | TXT_SHADOW, GAMECANVAS_CENTER_X, param->pressStart, lang->getText(23), 1, noColor, 1, shdwTxtColor); } // Mini logo